Add remaining patch files

2024-11-09 19:40:48 -05:00 · 2021-02-15 17:13:55 -05:00 · 2021-02-15 17:13:55 -05:00 · bbe93b1f12
commit bbe93b1f12
parent 238beb4a2d
43 changed files with 263 additions and 43 deletions
--- a/patches/patches/03_assignment.patch
+++ b/patches/patches/03_assignment.patch
@ -1 +1,12 @@
-
+37c37
 <     const n: u8 = 50;
 ---
 >     var n: u8 = 50;
 40c40
 <     const pi: u8 = 314159;
 ---
 >     const pi: u32 = 314159;
 42c42
 <     const negative_eleven: u8 = -11;
 ---
 >     const negative_eleven: i8 = -11;
--- a/patches/patches/04_arrays.patch
+++ b/patches/patches/04_arrays.patch
@ -1 +1,12 @@
-
+30c30
 <     const some_primes = [_]u8{ 1, 3, 5, 7, 11, 13, 17, 19 };
 ---
 >     var some_primes = [_]u8{ 1, 3, 5, 7, 11, 13, 17, 19 };
 43c43
 <     const fourth = some_primes[???];
 ---
 >     const fourth = some_primes[3];
 47c47
 <     const length = some_primes.???;
 ---
 >     const length = some_primes.len;
--- a/patches/patches/05_arrays2.patch
+++ b/patches/patches/05_arrays2.patch
@ -1 +1,8 @@
-
+23c23
 <     const leet = ???;
 ---
 >     const leet = le ++ et;
 28c28
 <     const bit_pattern = [_]u8{ ??? } ** 3;
 ---
 >     const bit_pattern = [_]u8{ 1, 0, 0, 1 } ** 3;
--- a/patches/patches/06_strings.patch
+++ b/patches/patches/06_strings.patch
@ -1 +1,12 @@
-
+22c22
 <     const d: u8 = ziggy[???];
 ---
 >     const d: u8 = ziggy[4];
 26c26
 <     const laugh = "ha " ???;
 ---
 >     const laugh = "ha " ** 3;
 33c33
 <     const major_tom = major ??? tom;
 ---
 >     const major_tom = major ++ " " ++ tom;
--- a/patches/patches/07_strings2.patch
+++ b/patches/patches/07_strings2.patch
@ -1 +1,8 @@
-
+18,20c18,20
 <         Ziggy played guitar
 <         Jamming good with Andrew Kelley
 <         And the Spiders from Mars
 ---
 >         \\Ziggy played guitar
 >         \\Jamming good with Andrew Kelley
 >         \\And the Spiders from Mars
--- a/patches/patches/08_quiz.patch
+++ b/patches/patches/08_quiz.patch
@ -1 +1,14 @@
-
+16c16
 <     const x: u8 = 1;
 ---
 >     var x: u8 = 1;
 27c27
 <     lang[???] = letters[x];
 ---
 >     lang[1] = letters[x];
 29,30c29,30
 <     x = ???;
 <     lang[2] = letters[???];
 ---
 >     x = 5;
 >     lang[2] = letters[x];
--- a/patches/patches/09_if.patch
+++ b/patches/patches/09_if.patch
@ -1 +1,4 @@
-
+26c26
 <     if (foo) {
 ---
 >     if (foo == 1) {
--- a/patches/patches/10_if2.patch
+++ b/patches/patches/10_if2.patch
@ -1 +1,4 @@
-
+13c13
 <     var price: u8 = if ???;
 ---
 >     var price: u8 = if (discount) 17 else 20;
--- a/patches/patches/11_while.patch
+++ b/patches/patches/11_while.patch
@ -1 +1,4 @@
-
+24c24
 <     while (???) {
 ---
 >     while (n < 1024) {
--- a/patches/patches/12_while2.patch
+++ b/patches/patches/12_while2.patch
@ -1 +1,4 @@
-
+28c28
 <     while (n < 1000) : ??? {
 ---
 >     while (n < 1000) : (n *= 2) {
--- a/patches/patches/13_while3.patch
+++ b/patches/patches/13_while3.patch
@ -1 +1,6 @@
-
+27,28c27,28
 <         if (n % 3 == 0) ???;
 <         if (n % 5 == 0) ???;
 ---
 >         if (n % 3 == 0) continue;
 >         if (n % 5 == 0) continue;
--- a/patches/patches/14_while4.patch
+++ b/patches/patches/14_while4.patch
@ -1 +1,4 @@
-
+21c21
 <         if (???) ???;
 ---
 >         if (n == 4) break;
--- a/patches/patches/15_for.patch
+++ b/patches/patches/15_for.patch
@ -1 +1,4 @@
-
+18c18
 <     for (???) |???| {
 ---
 >     for (story) |scene| {
--- a/patches/patches/16_for2.patch
+++ b/patches/patches/16_for2.patch
@ -1 +1,4 @@
-
+27c27
 <     for (bits) |bit, ???| {
 ---
 >     for (bits) |bit, i| {
--- a/patches/patches/17_quiz2.patch
+++ b/patches/patches/17_quiz2.patch
@ -1 +1,16 @@
-
+12c12
 < const std = import standard library;
 ---
 > const std = @import("std");
 14c14
 < function main() void {
 ---
 > pub fn main() void {
 19c19
 <     ??? (i <= stop_at) : (i += 1) {
 ---
 >     while (i <= stop_at) : (i += 1) {
 23c23
 <             std.debug.print("{}", .{???});
 ---
 >             std.debug.print("{}", .{i});
--- a/patches/patches/18_functions.patch
+++ b/patches/patches/18_functions.patch
@ -1 +1,4 @@
-
+31c31
 < ??? deepThought() ??? {
 ---
 > fn deepThought() u8 {
--- a/patches/patches/19_functions2.patch
+++ b/patches/patches/19_functions2.patch
@ -1 +1,4 @@
-
+25c25
 < fn twoToThe(???) u32 {
 ---
 > fn twoToThe(my_number: u32) u32 {
--- a/patches/patches/20_quiz3.patch
+++ b/patches/patches/20_quiz3.patch
@ -1 +1,18 @@
-
+24,25c24,25
 < fn printPowersOfTwo(numbers: [4]u16) ??? {
 <     loop (numbers) |n| {
 ---
 > fn printPowersOfTwo(numbers: [4]u16) void {
 >     for (numbers) |n| {
 34c34
 < fn twoToThe(number: u16) ??? {
 ---
 > fn twoToThe(number: u16) u16 {
 38c38
 <     loop (n < number) : (n += 1) {
 ---
 >     while (n < number) : (n += 1) {
 42c42
 <     return ???;
 ---
 >     return total;
--- a/patches/patches/21_errors.patch
+++ b/patches/patches/21_errors.patch
@ -1 +1,8 @@
-
+12c12
 <     ???,
 ---
 >     TooSmall,
 29c29
 <         if (???) {
 ---
 >         if (number_error == MyNumberError.TooSmall) {
--- a/patches/patches/22_errors2.patch
+++ b/patches/patches/22_errors2.patch
@ -1 +1,4 @@
-
+22c22
 <     var my_number: ??? = 5;
 ---
 >     var my_number: MyNumberError!u8 = 5;
--- a/patches/patches/23_errors3.patch
+++ b/patches/patches/23_errors3.patch
@ -1 +1,8 @@
-
+15c15
 <     var b: u32 = addTwenty(4) ??? 22;
 ---
 >     var b: u32 = addTwenty(4) catch 22;
 22c22
 < fn addTwenty(n: u32) ??? {
 ---
 > fn addTwenty(n: u32) MyNumberError!u32 {
--- a/patches/patches/24_errors4.patch
+++ b/patches/patches/24_errors4.patch
@ -1 +1,10 @@
-
+62c62,68
 <     return detectProblems(n) ??? 
 ---
 >     return detectProblems(n) catch |err| {
 >         if (err == MyNumberError.TooSmall) {
 >             return 10;
 >         }
 > 
 >         return err;
 >     };
--- a/patches/patches/25_errors5.patch
+++ b/patches/patches/25_errors5.patch
@ -1 +1,4 @@
-
+29c29
 <     var x = detect(n);
 ---
 >     var x = try detect(n);
--- a/patches/patches/26_hello2.patch
+++ b/patches/patches/26_hello2.patch
@ -1 +1,4 @@
-
+22c22
 <     stdout.print("Hello world!\n", .{});
 ---
 >     try stdout.print("Hello world!\n", .{});
--- a/patches/patches/27_defer.patch
+++ b/patches/patches/27_defer.patch
@ -1 +1,4 @@
-
+23c23
 <     std.debug.print("Two\n", .{});
 ---
 >     defer std.debug.print("Two\n", .{});
--- a/patches/patches/28_defer2.patch
+++ b/patches/patches/28_defer2.patch
@ -1 +1,4 @@
-
+21c21
 <     std.debug.print(") ", .{}); // <---- how!?
 ---
 >     defer std.debug.print(") ", .{}); // <---- how!?
--- a/patches/patches/29_errdefer.patch
+++ b/patches/patches/29_errdefer.patch
@ -1 +1,4 @@
-
+35c34
 <     std.debug.print("failed!\n", .{});
 ---
 >     errdefer std.debug.print("failed!\n", .{});
--- a/patches/patches/30_switch.patch
+++ b/patches/patches/30_switch.patch
@ -1 +1,2 @@
-
+48a49
 >             else => std.debug.print("?", .{}),
--- a/patches/patches/31_switch2.patch
+++ b/patches/patches/31_switch2.patch
@ -1 +1,2 @@
-
+33a34
 >             else => '!',
--- a/patches/patches/32_unreachable.patch
+++ b/patches/patches/32_unreachable.patch
@ -1 +1,2 @@
-
+37a38
 >             else => unreachable,
--- a/patches/patches/33_iferror.patch
+++ b/patches/patches/33_iferror.patch
@ -1 +1,2 @@
-
+36a37
 >             MyNumberError.TooSmall => std.debug.print("<4. ", .{}),
--- a/patches/patches/34_quiz4.patch
+++ b/patches/patches/34_quiz4.patch
@ -1 +1,8 @@
-
+12c12
 < pub fn main() void {
 ---
 > pub fn main() !void {
 15c15
 <     const my_num: u32 = getNumber();
 ---
 >     const my_num: u32 = try getNumber();
--- a/patches/patches/35_enums.patch
+++ b/patches/patches/35_enums.patch
@ -1 +1,4 @@
-
+23c23
 < const Ops = enum { ??? };
 ---
 > const Ops = enum { dec, inc, pow };
--- a/patches/patches/36_enums2.patch
+++ b/patches/patches/36_enums2.patch
@ -1 +1,12 @@
-
+32c32
 <     blue = ???,
 ---
 >     blue = 0x0000ff,
 54c54
 <         \\  <span style="color: #{}">Blue</span>
 ---
 >         \\  <span style="color: #{x:0>6}">Blue</span>
 59c59
 <         @enumToInt(???), // Oops! We're missing something!
 ---
 >         @enumToInt(Color.blue), // Oops! We're missing something!
--- a/patches/patches/37_structs.patch
+++ b/patches/patches/37_structs.patch
@ -1 +1,4 @@
-
+38a39
 >     health: u8,
 46a48
 >         .health = 100,
--- a/patches/patches/38_structs2.patch
+++ b/patches/patches/38_structs2.patch
@ -1 +1,7 @@
-
+44a45,50
 >     chars[1] = Character{
 >         .class = Class.bard,
 >         .gold = 10,
 >         .health = 100,
 >         .experience = 20,
 >     };
--- a/patches/patches/39_pointers.patch
+++ b/patches/patches/39_pointers.patch
@ -1 +1,4 @@
-
+33c33
 <     num2 = ???;
 ---
 >     num2 = num1_pointer.*;
--- a/patches/patches/40_pointers2.patch
+++ b/patches/patches/40_pointers2.patch
@ -1 +1,4 @@
-
+24c24
 <     const b: *u8 = &a; // fix this!
 ---
 >     const b: *const u8 = &a; // fix this!
--- a/patches/patches/41_pointers3.patch
+++ b/patches/patches/41_pointers3.patch
@ -1 +1,4 @@
-
+34c34
 <     ??? p: ??? = undefined;
 ---
 >     var p: *u8 = undefined;
--- a/patches/patches/42_pointers4.patch
+++ b/patches/patches/42_pointers4.patch
@ -1 +1,4 @@
-
+31c31
 <     ??? = 5; // fix me!
 ---
 >     x.* = 5; // fix me!
--- a/patches/patches/43_pointers5.patch
+++ b/patches/patches/43_pointers5.patch
@ -1 +1,4 @@
-
+60c60
 <     printCharacter(???);
 ---
 >     printCharacter(&glorp);
--- a/patches/patches/44_quiz5.patch
+++ b/patches/patches/44_quiz5.patch
@ -1 +1,4 @@
-
+21a22
 >     var elephantB = Elephant{ .letter = 'B' };
 27a29
 >     elephantB.tail = &elephantC;
--- a/patches/patches/45_optionals.patch
+++ b/patches/patches/45_optionals.patch
@ -1 +1,4 @@
-
+32c32
 <     var answer: u8 = result;
 ---
 >     var answer: u8 = result orelse 42;
		`@ -1 +1,2 @@`
							`36a37`
							`> MyNumberError.TooSmall => std.debug.print("<4. ", .{}),`