diff options
| author | Chris Boesch <chrboesch@noreply.codeberg.org> | 2026-04-30 19:53:56 +0200 |
|---|---|---|
| committer | Chris Boesch <chrboesch@noreply.codeberg.org> | 2026-04-30 19:53:56 +0200 |
| commit | 6048e6ef21b670b7fab6e9ae0c59a87550aceb6c (patch) | |
| tree | 489beb8f2ebdd4e1700dcd2bfb2f799d72470ea0 | |
| parent | 4bdcf195b982ae78181b1f8b9d64017e7aa5e5a5 (diff) | |
| parent | 3a782a96d5fdad216c45c6c6af06a8a85ff59340 (diff) | |
Merge pull request 'fixed compileError printing' (#419) from i418 into main
Reviewed-on: https://codeberg.org/ziglings/exercises/pulls/419
| -rw-r--r-- | exercises/074_comptime9.zig | 5 | ||||
| -rw-r--r-- | patches/patches/074_comptime9.patch | 12 |
2 files changed, 9 insertions, 8 deletions
diff --git a/exercises/074_comptime9.zig b/exercises/074_comptime9.zig index 50894fd..1fc8e31 100644 --- a/exercises/074_comptime9.zig +++ b/exercises/074_comptime9.zig @@ -1,4 +1,5 @@ -const print = @import("std").debug.print; +const std = @import("std"); +const print = std.debug.print; // We're going to (ab)use the power of Zig to make animal hybrid creatures! // What do you think a GatorMouse would look like? Eek. @@ -58,7 +59,7 @@ fn makeCreature(comptime count: usize, comptime fmt: []const u8) [count]Animal { // other animals or is this an error? 'g' => ???, - else => @compileError("No animal starts with '" ++ char ++ "'!"), + else => @compileError(std.fmt.comptimePrint("No animal starts with '{c}'!", .{char})), }, .l => switch (char) { diff --git a/patches/patches/074_comptime9.patch b/patches/patches/074_comptime9.patch index 44a1709..bc3522d 100644 --- a/patches/patches/074_comptime9.patch +++ b/patches/patches/074_comptime9.patch @@ -1,6 +1,6 @@ ---- exercises/074_comptime9.zig 2026-04-11 21:35:08.132459373 -0700 -+++ answers/074_comptime9.zig 2026-04-12 07:13:37.971010827 -0700 -@@ -27,12 +27,12 @@ +--- exercises/074_comptime9.zig 2026-04-30 19:28:08.990995153 +0200 ++++ answers/074_comptime9.zig 2026-04-30 19:27:09.642728692 +0200 +@@ -28,12 +28,12 @@ start, // Ready to start a new animal. l, // This means we've seen an "l", so if we see an "m", we know it's a Llama. }; @@ -15,16 +15,16 @@ inline for (fmt) |char| { -@@ -56,7 +56,7 @@ +@@ -57,7 +57,7 @@ // // What do you think happens with Gators? Do they join with // other animals or is this an error? - 'g' => ???, + 'g' => @compileError("Gators refuse to join with other animals."), - else => @compileError("No animal starts with '" ++ char ++ "'!"), + else => @compileError(std.fmt.comptimePrint("No animal starts with '{c}'!", .{char})), }, -@@ -68,7 +68,7 @@ +@@ -69,7 +69,7 @@ next_animal += 1; // Something is missing here. After we finish a Llama, we // need to be ready to _start_ over with a new animal... |