From bd55c4ac5a235778f78b91c37a0bf1516bfbcc55 Mon Sep 17 00:00:00 2001 From: Luka Markušić Date: Tue, 2 Jun 2026 06:11:27 +0200 Subject: fixup! Add another defer exercise --- patches/patches/028_defer2.patch | 18 +++++++++++++++--- patches/patches/116_defer3.patch | 14 -------------- 2 files changed, 15 insertions(+), 17 deletions(-) delete mode 100644 patches/patches/116_defer3.patch (limited to 'patches') diff --git a/patches/patches/028_defer2.patch b/patches/patches/028_defer2.patch index f09b1e5..28eb806 100644 --- a/patches/patches/028_defer2.patch +++ b/patches/patches/028_defer2.patch @@ -1,6 +1,6 @@ ---- exercises/028_defer2.zig 2023-10-03 22:15:22.122241138 +0200 -+++ answers/028_defer2.zig 2023-10-05 20:04:06.966098530 +0200 -@@ -18,7 +18,7 @@ +--- exercises/028_defer2.zig 2026-06-02 06:08:12.713672612 +0200 ++++ answers/028_defer2.zig 2026-06-02 06:08:43.262234023 +0200 +@@ -20,7 +20,7 @@ fn printAnimal(animal: u8) void { std.debug.print("(", .{}); @@ -9,3 +9,15 @@ if (animal == 'g') { std.debug.print("Goat", .{}); +@@ -51,9 +51,9 @@ + + // Try reordering the statements to get the answer 42 + { +- defer x = x / 10; +- defer x = x + 11; + defer x = x * 2; ++ defer x = x + 11; ++ defer x = x / 10; + } + + return x; diff --git a/patches/patches/116_defer3.patch b/patches/patches/116_defer3.patch deleted file mode 100644 index 7b2cce5..0000000 --- a/patches/patches/116_defer3.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- exercises/116_defer3.zig 2026-05-31 22:29:56.189323732 +0200 -+++ answers/116_defer3.zig 2026-05-31 22:30:17.749186667 +0200 -@@ -7,9 +7,9 @@ - var x: u32 = 100; - { - // Try reordering the statements to get the answer 42 -- defer x = x / 10; -- defer x = x + 11; - defer x = x * 2; -+ defer x = x + 11; -+ defer x = x / 10; - - // It might seem silly in this example, but it's important to know when - // deinitializing containers whose elements need to be deinitialized first. -- cgit v1.2.3