mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-06 06:13:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Sema: make @hasField support tuples too

Browse Source
This commit is contained in:
Andrew Kelley 2022-03-11 12:59:20 -07:00
parent 6a9c9afbae
commit a2517117e7
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Sema.zig
View File

@ -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; if (mem.eql(u8, name, field_name)) break true;
} else false; } 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()) { break :hf switch (ty.zigTypeTag()) {
.Struct => ty.structFields().contains(field_name), .Struct => ty.structFields().contains(field_name),
.Union => ty.unionFields().contains(field_name), .Union => ty.unionFields().contains(field_name),

8
test/behavior/hasfield.zig
View File

@ -38,4 +38,12 @@ test "@hasField" {
const anon = @TypeOf(.{ .a = 1 }); const anon = @TypeOf(.{ .a = 1 });
try expect(@hasField(anon, "a") == true); try expect(@hasField(anon, "a") == true);
try expect(@hasField(anon, "b") == false); 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);
} }