From f629d78268e8003437807eac34e0aa461e081cdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roman=20Fro=C5=82ow?= <rofrol@gmail.com> Date: Sat, 2 Nov 2024 10:48:50 +0100 Subject: [PATCH 1/3] reuse fields --- exercises/065_builtins2.zig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/exercises/065_builtins2.zig b/exercises/065_builtins2.zig index 0790db4..db0ea30 100644 --- a/exercises/065_builtins2.zig +++ b/exercises/065_builtins2.zig @@ -110,15 +110,15 @@ pub fn main() void { // name will not be printed if the field is of type 'void' // (which is a zero-bit type that takes up no space at all!): if (fields[0].??? != void) { - print(" {s}", .{@typeInfo(Narcissus).@"struct".fields[0].name}); + print(" {s}", .{fields.name}); } if (fields[1].??? != void) { - print(" {s}", .{@typeInfo(Narcissus).@"struct".fields[1].name}); + print(" {s}", .{fields[1].name}); } if (fields[2].??? != void) { - print(" {s}", .{@typeInfo(Narcissus).@"struct".fields[2].name}); + print(" {s}", .{fields[2].name}); } // Yuck, look at all that repeated code above! I don't know From 286439cddc81fb80fc7b5a8adb17afbcc4623c2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roman=20Fro=C5=82ow?= <rofrol@gmail.com> Date: Sat, 2 Nov 2024 14:37:41 +0100 Subject: [PATCH 2/3] zero --- exercises/065_builtins2.zig | 1 + 1 file changed, 1 insertion(+) diff --git a/exercises/065_builtins2.zig b/exercises/065_builtins2.zig index db0ea30..21a3911 100644 --- a/exercises/065_builtins2.zig +++ b/exercises/065_builtins2.zig @@ -111,6 +111,7 @@ pub fn main() void { // (which is a zero-bit type that takes up no space at all!): if (fields[0].??? != void) { print(" {s}", .{fields.name}); + print(" {s}", .{fields[0].name}); } if (fields[1].??? != void) { From 530dcde3d413849dc2fea18eddcfb8cf85a76cb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roman=20Fro=C5=82ow?= <rofrol@gmail.com> Date: Sat, 2 Nov 2024 14:38:53 +0100 Subject: [PATCH 3/3] patch --- patches/patches/065_builtins2.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/patches/patches/065_builtins2.patch b/patches/patches/065_builtins2.patch index d5da950..d6f0839 100644 --- a/patches/patches/065_builtins2.patch +++ b/patches/patches/065_builtins2.patch @@ -24,16 +24,16 @@ // (which is a zero-bit type that takes up no space at all!): - if (fields[0].??? != void) { + if (fields[0].type != void) { - print(" {s}", .{@typeInfo(Narcissus).@"struct".fields[0].name}); + print(" {s}", .{fields[0].name}); } - if (fields[1].??? != void) { + if (fields[1].type != void) { - print(" {s}", .{@typeInfo(Narcissus).@"struct".fields[1].name}); + print(" {s}", .{fields[1].name}); } - if (fields[2].??? != void) { + if (fields[2].type != void) { - print(" {s}", .{@typeInfo(Narcissus).@"struct".fields[2].name}); + print(" {s}", .{fields[2].name}); }