Просмотр исходного кода

Merge pull request 'Fixes the changes in zig's struct.fields' (#279) from i278 into main

Reviewed-on: https://codeberg.org/ziglings/exercises/pulls/279
Chris Boesch 2 месяцев назад
Родитель
Сommit
34a7c6c861
2 измененных файлов с 9 добавлено и 5 удалено
  1. 6 2
      exercises/065_builtins2.zig
  2. 3 3
      patches/patches/065_builtins2.patch

+ 6 - 2
exercises/065_builtins2.zig

@@ -99,11 +99,15 @@ pub fn main() void {
     // 'fields' is a slice of StructFields. Here's the declaration:
     //
     //     pub const StructField = struct {
-    //         name: []const u8,
+    //         name: [:0]const u8,
     //         type: type,
-    //         default_value: anytype,
+    //         default_value_ptr: ?*const anyopaque,
     //         is_comptime: bool,
     //         alignment: comptime_int,
+    //
+    //         defaultValue() ?sf.type  // Function that loads the
+    //                                  // field's default value from
+    //                                  // `default_value_ptr`
     //     };
     //
     // Please complete these 'if' statements so that the field

+ 3 - 3
patches/patches/065_builtins2.patch

@@ -1,5 +1,5 @@
---- exercises/065_builtins2.zig	2024-11-02 16:58:30.607829441 +0100
-+++ answers/065_builtins2.zig	2024-11-02 16:58:33.821220588 +0100
+--- exercises/065_builtins2.zig	2025-06-17 13:58:07.857258167 +0200
++++ answers/065_builtins2.zig	2025-06-17 13:56:36.630415938 +0200
 @@ -58,7 +58,7 @@
      // Oops! We cannot leave the 'me' and 'myself' fields
      // undefined. Please set them here:
@@ -18,7 +18,7 @@
  
      // Now we print a pithy statement about Narcissus.
      print("A {s} loves all {s}es. ", .{
-@@ -109,15 +109,15 @@
+@@ -113,15 +113,15 @@
      // Please complete these 'if' statements so that the field
      // 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!):