diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2022-03-11 12:59:20 -0700 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2022-03-11 12:59:20 -0700 |
| commit | a2517117e7cffcc4be21e944f2b4f8661c8f15a3 (patch) | |
| tree | 5e80c067eedc2941d8a30d62706a11e150f728c1 | |
| parent | 6a9c9afbae24897a5c6fa843794be33e4ed33f12 (diff) | |
| download | zig-a2517117e7cffcc4be21e944f2b4f8661c8f15a3.tar.gz zig-a2517117e7cffcc4be21e944f2b4f8661c8f15a3.zip | |
Sema: make `@hasField` support tuples too
| -rw-r--r-- | src/Sema.zig | 4 | ||||
| -rw-r--r-- | test/behavior/hasfield.zig | 8 |
2 files changed, 12 insertions, 0 deletions
diff --git a/src/Sema.zig b/src/Sema.zig index 41ca123062..ac43ef76b3 100644 --- a/src/Sema.zig +++ b/src/Sema.zig @@ -7795,6 +7795,10 @@ fn zirHasField(sema: *Sema, block: *Block, inst: Zir.Inst.Index) CompileError!Ai if (mem.eql(u8, name, field_name)) break true; } else false; } + if (ty.isTuple()) { + const field_index = std.fmt.parseUnsigned(u32, field_name, 10) catch break :hf false; + break :hf field_index < ty.structFieldCount(); + } break :hf switch (ty.zigTypeTag()) { .Struct => ty.structFields().contains(field_name), .Union => ty.unionFields().contains(field_name), diff --git a/test/behavior/hasfield.zig b/test/behavior/hasfield.zig index 6b31ba22a9..52680f1aa5 100644 --- a/test/behavior/hasfield.zig +++ b/test/behavior/hasfield.zig @@ -38,4 +38,12 @@ test "@hasField" { const anon = @TypeOf(.{ .a = 1 }); try expect(@hasField(anon, "a") == true); try expect(@hasField(anon, "b") == false); + + const tuple = @TypeOf(.{ 1, 2 }); + try expect(@hasField(tuple, "a") == false); + try expect(@hasField(tuple, "b") == false); + try expect(@hasField(tuple, "0") == true); + try expect(@hasField(tuple, "1") == true); + try expect(@hasField(tuple, "2") == false); + try expect(@hasField(tuple, "9999999999999999999999999") == false); } |