From 6a9c9afbae24897a5c6fa843794be33e4ed33f12 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Fri, 11 Mar 2022 09:26:36 -0800 Subject: [PATCH 1/2] stage2: @hasField for anon structs --- src/Sema.zig | 5 +++++ test/behavior/hasfield.zig | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/src/Sema.zig b/src/Sema.zig index a33861c74c..41ca123062 100644 --- a/src/Sema.zig +++ b/src/Sema.zig @@ -7790,6 +7790,11 @@ fn zirHasField(sema: *Sema, block: *Block, inst: Zir.Inst.Index) CompileError!Ai if (mem.eql(u8, field_name, "len")) break :hf true; break :hf false; } + if (ty.castTag(.anon_struct)) |pl| { + break :hf for (pl.data.names) |name| { + if (mem.eql(u8, name, field_name)) break true; + } else false; + } 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 81026273c0..6b31ba22a9 100644 --- a/test/behavior/hasfield.zig +++ b/test/behavior/hasfield.zig @@ -34,4 +34,8 @@ test "@hasField" { try expect(@hasField(enm, "b") == true); try expect(@hasField(enm, "non-existant") == false); try expect(@hasField(enm, "nope") == false); + + const anon = @TypeOf(.{ .a = 1 }); + try expect(@hasField(anon, "a") == true); + try expect(@hasField(anon, "b") == false); } From a2517117e7cffcc4be21e944f2b4f8661c8f15a3 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Fri, 11 Mar 2022 12:59:20 -0700 Subject: [PATCH 2/2] Sema: make `@hasField` support tuples too --- src/Sema.zig | 4 ++++ test/behavior/hasfield.zig | 8 ++++++++ 2 files changed, 12 insertions(+) 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); }