summaryrefslogtreecommitdiffstatshomepage
path: root/patches/patches
diff options
context:
space:
mode:
authorManlio Perillo <manlio.perillo@gmail.com>2023-04-17 09:19:49 +0200
committerManlio Perillo <manlio.perillo@gmail.com>2023-04-18 18:16:19 +0200
commitc7697a428206a46326a61b2c851aab2a7dadb8b8 (patch)
treed5be07fcca217587eb188d8e7b1ca1a6cdb463f6 /patches/patches
parent7d7be0482c3a2cafc91c743c6d139b5c140457f3 (diff)
Ensure the patches are up-to-date and consistent
Add the update-patches.py tool. Update all the patches, so that the files are up-to-date and use the same patch file format.
Diffstat (limited to 'patches/patches')
-rw-r--r--patches/patches/026_hello2.patch2
-rw-r--r--patches/patches/029_errdefer.patch2
-rw-r--r--patches/patches/040_pointers2.patch2
-rw-r--r--patches/patches/046_optionals2.patch4
-rw-r--r--patches/patches/050_no_value.patch2
-rw-r--r--patches/patches/064_builtins.patch4
-rw-r--r--patches/patches/065_builtins2.patch59
-rw-r--r--patches/patches/066_comptime.patch2
-rw-r--r--patches/patches/076_sentinels.patch4
-rw-r--r--patches/patches/080_anonymous_structs.patch26
-rw-r--r--patches/patches/096_memory_allocation.patch2
-rw-r--r--patches/patches/097_bit_manipulation.patch2
-rw-r--r--patches/patches/098_bit_manipulation2.patch2
13 files changed, 42 insertions, 71 deletions
diff --git a/patches/patches/026_hello2.patch b/patches/patches/026_hello2.patch
index 0065da5..e97a7b5 100644
--- a/patches/patches/026_hello2.patch
+++ b/patches/patches/026_hello2.patch
@@ -1,4 +1,4 @@
-22c22
+26c26
< stdout.print("Hello world!\n", .{});
---
> try stdout.print("Hello world!\n", .{});
diff --git a/patches/patches/029_errdefer.patch b/patches/patches/029_errdefer.patch
index f93c56f..aa42279 100644
--- a/patches/patches/029_errdefer.patch
+++ b/patches/patches/029_errdefer.patch
@@ -1,4 +1,4 @@
-35c34
+35c35
< std.debug.print("failed!\n", .{});
---
> errdefer std.debug.print("failed!\n", .{});
diff --git a/patches/patches/040_pointers2.patch b/patches/patches/040_pointers2.patch
index a69cb20..87291c3 100644
--- a/patches/patches/040_pointers2.patch
+++ b/patches/patches/040_pointers2.patch
@@ -1,4 +1,4 @@
-24c24
+26c26
< const b: *u8 = &a; // fix this!
---
> const b: *const u8 = &a; // fix this!
diff --git a/patches/patches/046_optionals2.patch b/patches/patches/046_optionals2.patch
index 8437cdc..89fa604 100644
--- a/patches/patches/046_optionals2.patch
+++ b/patches/patches/046_optionals2.patch
@@ -1,8 +1,8 @@
-24c12
+24c24
< tail: *Elephant = null, // Hmm... tail needs something...
---
> tail: ?*Elephant = null, // <---- make this optional!
-54c42
+54c54
< if (e.tail == null) ???;
---
> if (e.tail == null) break;
diff --git a/patches/patches/050_no_value.patch b/patches/patches/050_no_value.patch
index 79db0a3..7ea4e9e 100644
--- a/patches/patches/050_no_value.patch
+++ b/patches/patches/050_no_value.patch
@@ -6,7 +6,7 @@
< var first_line2: Err!*const [21]u8 = ???;
---
> var first_line2: Err!*const [21]u8 = Err.Cthulhu;
-79,80c79,80
+80,81c80,81
< fn printSecondLine() ??? {
< var second_line2: ?*const [18]u8 = ???;
---
diff --git a/patches/patches/064_builtins.patch b/patches/patches/064_builtins.patch
index ebe313d..8a154a4 100644
--- a/patches/patches/064_builtins.patch
+++ b/patches/patches/064_builtins.patch
@@ -1,8 +1,8 @@
-72c72
+67c67
< const expected_result: u8 = ???;
---
> const expected_result: u8 = 0b00010010;
-88c88
+82c82
< const tupni: u8 = @bitReverse(input, tupni);
---
> const tupni: u8 = @bitReverse(input);
diff --git a/patches/patches/065_builtins2.patch b/patches/patches/065_builtins2.patch
index 89fb55f..1b085ef 100644
--- a/patches/patches/065_builtins2.patch
+++ b/patches/patches/065_builtins2.patch
@@ -1,39 +1,20 @@
---- exercises/065_builtins2.zig
-+++ answers/065_builtins2.zig
-@@ -58,7 +58,7 @@
- // Oops! We cannot leave the 'me' and 'myself' fields
- // undefined. Please set them here:
- narcissus.me = &narcissus;
-- narcissus.??? = ???;
-+ narcissus.myself = &narcissus;
-
- // This determines a "peer type" from three separate
- // references (they just happen to all be the same object).
-@@ -70,7 +70,7 @@
- //
- // The fix for this is very subtle, but it makes a big
- // difference!
-- const Type2 = narcissus.fetchTheMostBeautifulType();
-+ const Type2 = Narcissus.fetchTheMostBeautifulType();
-
- // Now we print a pithy statement about Narcissus.
- print("A {s} loves all {s}es. ", .{
-@@ -109,15 +109,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!):
-- if (fields[0].??? != void) {
-+ if (fields[0].type != void) {
- print(" {s}", .{@typeInfo(Narcissus).Struct.fields[0].name});
- }
-
-- if (fields[1].??? != void) {
-+ if (fields[1].type != void) {
- print(" {s}", .{@typeInfo(Narcissus).Struct.fields[1].name});
- }
-
-- if (fields[2].??? != void) {
-+ if (fields[2].type != void) {
- print(" {s}", .{@typeInfo(Narcissus).Struct.fields[2].name});
- }
-
+61c61
+< narcissus.??? = ???;
+---
+> narcissus.myself = &narcissus;
+73c73
+< const Type2 = narcissus.fetchTheMostBeautifulType();
+---
+> const Type2 = Narcissus.fetchTheMostBeautifulType();
+112c112
+< if (fields[0].??? != void) {
+---
+> if (fields[0].type != void) {
+116c116
+< if (fields[1].??? != void) {
+---
+> if (fields[1].type != void) {
+120c120
+< if (fields[2].??? != void) {
+---
+> if (fields[2].type != void) {
diff --git a/patches/patches/066_comptime.patch b/patches/patches/066_comptime.patch
index 4828ad6..e7130c2 100644
--- a/patches/patches/066_comptime.patch
+++ b/patches/patches/066_comptime.patch
@@ -1,4 +1,4 @@
-64,65c64,65
+65,66c65,66
< var var_int = 12345;
< var var_float = 987.654;
---
diff --git a/patches/patches/076_sentinels.patch b/patches/patches/076_sentinels.patch
index 3cf4877..55c4c96 100644
--- a/patches/patches/076_sentinels.patch
+++ b/patches/patches/076_sentinels.patch
@@ -1,8 +1,8 @@
-85c84
+85c85
< for (???) |s| {
---
> for (my_seq) |s| {
-97c96
+97c97
< while (??? != my_sentinel) {
---
> while (my_seq[i] != my_sentinel) {
diff --git a/patches/patches/080_anonymous_structs.patch b/patches/patches/080_anonymous_structs.patch
index 6df1890..a94e7b8 100644
--- a/patches/patches/080_anonymous_structs.patch
+++ b/patches/patches/080_anonymous_structs.patch
@@ -1,18 +1,8 @@
---- exercises/080_anonymous_structs.zig
-+++ answers/080_anonymous_structs.zig
-@@ -48,13 +48,13 @@
- // * circle1 should hold i32 integers
- // * circle2 should hold f32 floats
- //
-- var circle1 = ??? {
-+ var circle1 = Circle(i32){
- .center_x = 25,
- .center_y = 70,
- .radius = 15,
- };
-
-- var circle2 = ??? {
-+ var circle2 = Circle(f32){
- .center_x = 25.234,
- .center_y = 70.999,
- .radius = 15.714,
+51c51
+< var circle1 = ??? {
+---
+> var circle1 = Circle(i32){
+57c57
+< var circle2 = ??? {
+---
+> var circle2 = Circle(f32){
diff --git a/patches/patches/096_memory_allocation.patch b/patches/patches/096_memory_allocation.patch
index 5398ce5..fd990b0 100644
--- a/patches/patches/096_memory_allocation.patch
+++ b/patches/patches/096_memory_allocation.patch
@@ -1,4 +1,4 @@
-65c65
+66c66
< var avg: []f64 = ???;
---
> var avg: []f64 = try allocator.alloc(f64, arr.len);
diff --git a/patches/patches/097_bit_manipulation.patch b/patches/patches/097_bit_manipulation.patch
index e216309..2afe3da 100644
--- a/patches/patches/097_bit_manipulation.patch
+++ b/patches/patches/097_bit_manipulation.patch
@@ -1,4 +1,4 @@
-82c82
+83c83
< ???;
---
> x ^= y;
diff --git a/patches/patches/098_bit_manipulation2.patch b/patches/patches/098_bit_manipulation2.patch
index 1b5df35..8becd34 100644
--- a/patches/patches/098_bit_manipulation2.patch
+++ b/patches/patches/098_bit_manipulation2.patch
@@ -1,4 +1,4 @@
-62c62
+63c63
< return bits == 0x..???;
---
> return bits == 0x3ffffff;