From ec6f6c5870014eca466c189e4cdd0d6ba040701d Mon Sep 17 00:00:00 2001 From: Dizzyi Date: Mon, 25 Mar 2024 01:11:33 +0800 Subject: [PATCH 01/20] added exercise/106_files.zig --- .gitignore | 1 + exercises/106_files.zig | 93 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 94 insertions(+) create mode 100644 exercises/106_files.zig diff --git a/.gitignore b/.gitignore index 4dc8b36..f07c7a1 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /zig-out/ /answers/ /patches/healed/ +/output/ diff --git a/exercises/106_files.zig b/exercises/106_files.zig new file mode 100644 index 0000000..450ff96 --- /dev/null +++ b/exercises/106_files.zig @@ -0,0 +1,93 @@ +// +// Until now, we've only been printing our output in the console, +// which is good enough for fighting alien and hermit bookkeeping. +// +// However, many other task require some interaction with the file system, +// which is the underlying structure for organizing files on your computer. +// +// The File System provide a hierarchical structure for storing files +// by organizing files into directories, which hold files and other directories, +// thus creating a tree structure for navigating. +// +// Fortunately, zig standard library provide a simple api for interacting +// with the file system, see the detail documentation here +// +// https://ziglang.org/documentation/master/std/#std.fs +// +// In this exercise, we'll try to +// - create a new directory +// - open a file in the directory +// - write to the file. +// +// import std as always +const std = @import("std"); + +pub fn main() !void { + // first we get the current working directory + const cwd: std.fs.Dir = std.fs.cwd(); + + // then we'll try to make a new directory /output/ + // to put our output files. + cwd.makeDir("output") catch |e| switch (e) { + // there are chance you might want to run this + // program more than once and the path might already + // been created, so we'll have to handle this error + // by doing nothing + // + // we want to catch error.PathAlreadyExists and do nothing + ??? => { + ??? + }, + // if is any other unexpected error we just propagate it through + else => return e, + }; + + // then we'll try to open our freshly created directory + // wait a minute + // opening a directory might fail! + // what should we do here? + const output_dir: std.fs.Dir = cwd.openDir("output", .{}); + + // we try to open the file `zigling.txt`, + // and propagate the error up if there are any errors + const file: std.fs.File = try output_dir.createFile("zigling.txt", .{}); + // it is a good habit to close a file after you are done with + // so that other program can read it and prevent data corruption + // but here we are not yet done writing to the file + // if only there are a keyword in zig that + // allow you "defer" code execute to the end of scope... + file.close(); + + // !you are not allow to switch this two lines to before file closing line! + const byte_written = try file.write("It's zigling time!"); + std.debug.print("succefully wrote {} bytes.\n", .{byte_written}); +} +// to check if you actually write to the file, you can either, +// 1. open the file on your text editor, or +// 2. print the content of the file in the console with command +// >> cat ./output/zigling.txt +// +// +// More on Creating files +// +// notice in: +// ... try output_dir.createFile("zigling.txt", .{}); +// ^^^ +// we passed this anonymous struct to the function call +// +// this is the struct `CreateFlag` with default fields +// { +// read: bool = false, +// truncate: bool = true, +// exclusive: bool = false, +// lock: Lock = .none, +// lock_nonblocking: bool = false, +// mode: Mode = default_mode +// } +// +// Question: +// - what should you do if you want to also read the file after opening it? +// - go to documentation of the struct `std.fs.Dir` here +// https://ziglang.org/documentation/master/std/#std.fs.Dir +// - can you find a function for opening a file? how about deleting a file? +// - what kind of option can you uses with those function? From 66d08f1e1fc44af0e5a626984df3d20e7cf1a1b7 Mon Sep 17 00:00:00 2001 From: Alan CHUNG Date: Mon, 25 Mar 2024 16:24:42 +0800 Subject: [PATCH 02/20] modified build.zig --- build.zig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build.zig b/build.zig index 8319bb4..6c5a073 100644 --- a/build.zig +++ b/build.zig @@ -1121,6 +1121,10 @@ const exercises = [_]Exercise{ .main_file = "105_threading2.zig", .output = "PI ≈ 3.14159265", }, + .{ + .main_file = "106_files.zig", + .output = "succefully wrote 18 bytes.", + }, .{ .main_file = "999_the_end.zig", .output = From 23b11a7509915b8c02b9329a78f2df22fe2eac5f Mon Sep 17 00:00:00 2001 From: Alan CHUNG Date: Mon, 25 Mar 2024 16:36:15 +0800 Subject: [PATCH 03/20] 106_files.zig format --- exercises/106_files.zig | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/exercises/106_files.zig b/exercises/106_files.zig index 450ff96..ffa0f86 100644 --- a/exercises/106_files.zig +++ b/exercises/106_files.zig @@ -8,13 +8,13 @@ // The File System provide a hierarchical structure for storing files // by organizing files into directories, which hold files and other directories, // thus creating a tree structure for navigating. -// +// // Fortunately, zig standard library provide a simple api for interacting // with the file system, see the detail documentation here // // https://ziglang.org/documentation/master/std/#std.fs // -// In this exercise, we'll try to +// In this exercise, we'll try to // - create a new directory // - open a file in the directory // - write to the file. @@ -67,14 +67,14 @@ pub fn main() !void { // 2. print the content of the file in the console with command // >> cat ./output/zigling.txt // -// +// // More on Creating files -// +// // notice in: // ... try output_dir.createFile("zigling.txt", .{}); // ^^^ // we passed this anonymous struct to the function call -// +// // this is the struct `CreateFlag` with default fields // { // read: bool = false, @@ -84,7 +84,7 @@ pub fn main() !void { // lock_nonblocking: bool = false, // mode: Mode = default_mode // } -// +// // Question: // - what should you do if you want to also read the file after opening it? // - go to documentation of the struct `std.fs.Dir` here From 74a6e60e17d8e71f9df37e3ac6ae30b4718e6034 Mon Sep 17 00:00:00 2001 From: Alan CHUNG Date: Mon, 25 Mar 2024 16:39:45 +0800 Subject: [PATCH 04/20] add patch files for 106_files.zig --- exercises/106_files.zig | 8 ++++---- patches/patches/106_files.patch | Bin 0 -> 2630 bytes 2 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 patches/patches/106_files.patch diff --git a/exercises/106_files.zig b/exercises/106_files.zig index ffa0f86..0b593ed 100644 --- a/exercises/106_files.zig +++ b/exercises/106_files.zig @@ -35,8 +35,8 @@ pub fn main() !void { // by doing nothing // // we want to catch error.PathAlreadyExists and do nothing - ??? => { - ??? + error.PathAlreadyExists => { + return; }, // if is any other unexpected error we just propagate it through else => return e, @@ -46,7 +46,7 @@ pub fn main() !void { // wait a minute // opening a directory might fail! // what should we do here? - const output_dir: std.fs.Dir = cwd.openDir("output", .{}); + const output_dir: std.fs.Dir = try cwd.openDir("output", .{}); // we try to open the file `zigling.txt`, // and propagate the error up if there are any errors @@ -56,7 +56,7 @@ pub fn main() !void { // but here we are not yet done writing to the file // if only there are a keyword in zig that // allow you "defer" code execute to the end of scope... - file.close(); + defer file.close(); // !you are not allow to switch this two lines to before file closing line! const byte_written = try file.write("It's zigling time!"); diff --git a/patches/patches/106_files.patch b/patches/patches/106_files.patch new file mode 100644 index 0000000000000000000000000000000000000000..07852c0ac3ba3a479f29f602a321c832be2497dd GIT binary patch literal 2630 zcmb_e+iu!G5S`~r{fC8@rXo108hTaRRB9jk);}QTVxXl48B?H9em(6uGad|%i4;<; z4C~#Q*_ktEX8reeAQMS2g0wM4c*`-5) z2s*t7>pYbw&`o8aX9e{m#tDhM!6^~OIjnZ%t-OT90B7)gdT@b3ZTj3k%3o@?bR6sX zrCj3VHhk;IDLf9aR?cmAE=xqf$Wr|N0e2|a$H5BejxsFL&=6ucnAL{GwiLHuP zZZl}4IdYgGn)e5AzCrfy!_sJ2si4e1tY&gYL~xATwH zVBLnb!OB=_{QGE{G~*pYf>P`@F&_3VdQa5IQX)$`jGcB9NU={fDoFVGV?{3jjj>`j zRrVU%thRu4=3xkq(x;M{ee9-1Hi&i(@A%s-e0m36=4yb-Nid7#i~35;Sz{~R@tADy zM4IY_+iC*$0L^Q;LBBBel}vq{2YG?k@t%YOn37j+-8za#$#vq%yx8p#2q}mvnKO@r7^9BRh~+sGkvSrHETozCq%d VdS+jDUZ2#QpvMl;Q=40S{{f*XhbsU8 literal 0 HcmV?d00001 From 9ce889b438622b40423068c0a9e8b98f4bb1ec39 Mon Sep 17 00:00:00 2001 From: Alan CHUNG Date: Tue, 26 Mar 2024 13:51:59 +0800 Subject: [PATCH 05/20] 106_files.zig actual test --- build.zig | 2 +- exercises/106_files.zig | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build.zig b/build.zig index 6c5a073..4517ff6 100644 --- a/build.zig +++ b/build.zig @@ -1123,7 +1123,7 @@ const exercises = [_]Exercise{ }, .{ .main_file = "106_files.zig", - .output = "succefully wrote 18 bytes.", + .output = "Succefully wrote 18 bytes.", }, .{ .main_file = "999_the_end.zig", diff --git a/exercises/106_files.zig b/exercises/106_files.zig index 0b593ed..b590679 100644 --- a/exercises/106_files.zig +++ b/exercises/106_files.zig @@ -35,8 +35,8 @@ pub fn main() !void { // by doing nothing // // we want to catch error.PathAlreadyExists and do nothing - error.PathAlreadyExists => { - return; + ??? => { + ???; }, // if is any other unexpected error we just propagate it through else => return e, @@ -46,7 +46,7 @@ pub fn main() !void { // wait a minute // opening a directory might fail! // what should we do here? - const output_dir: std.fs.Dir = try cwd.openDir("output", .{}); + const output_dir: std.fs.Dir = cwd.openDir("output", .{}); // we try to open the file `zigling.txt`, // and propagate the error up if there are any errors @@ -56,11 +56,11 @@ pub fn main() !void { // but here we are not yet done writing to the file // if only there are a keyword in zig that // allow you "defer" code execute to the end of scope... - defer file.close(); + file.close(); // !you are not allow to switch this two lines to before file closing line! const byte_written = try file.write("It's zigling time!"); - std.debug.print("succefully wrote {} bytes.\n", .{byte_written}); + std.debug.print("Succefully wrote {} bytes.\n", .{byte_written}); } // to check if you actually write to the file, you can either, // 1. open the file on your text editor, or From 9bf7a84e56e55b89eb8d08f275b31ed2bb6e1ce5 Mon Sep 17 00:00:00 2001 From: Alan CHUNG Date: Tue, 26 Mar 2024 13:53:29 +0800 Subject: [PATCH 06/20] 106_files.patches actual --- patches/patches/106_files.patch | Bin 2630 -> 2632 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/patches/patches/106_files.patch b/patches/patches/106_files.patch index 07852c0ac3ba3a479f29f602a321c832be2497dd..5a0cffc06abecf8e6b04e7d574cd8236b36d6db9 100644 GIT binary patch delta 53 zcmX>mazbQ6pL`O7DT5`00fQNXIgr)^LL(q;$&d=fMhvDK*RnG)T2E$V7Tha!h1GpL`la8bcz30g$v{Fk{dILIZ{*22%!024jX)hLnwK*_k$PW17Sc019ym A=l}o! From 92ea6718b2b41092d3927566d6610f3758f00822 Mon Sep 17 00:00:00 2001 From: Alan CHUNG Date: Tue, 26 Mar 2024 14:01:12 +0800 Subject: [PATCH 07/20] remove header of patch files of 106 --- patches/patches/106_files.patch | Bin 2632 -> 2442 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/patches/patches/106_files.patch b/patches/patches/106_files.patch index 5a0cffc06abecf8e6b04e7d574cd8236b36d6db9..bee61205ea54e10120a624e46b219fc996d45d18 100644 GIT binary patch delta 11 ScmX>h(k0CF|KG*~9h?9k_yv0a delta 103 zcmeAYJ|QCd|6dA2CPNw!Dlq5*VLFgkGLhYsS%D#GBDbksCPN-W3PUPG1yDYT!IZ(0 p!GOVx!5m2I0ih9)wgk#r0$HX&6^1}rkh}>H@-lESY-H--1OQ*u5zznu From 2c44f3e4ff6f2310b060779c3d344d4929f0c89d Mon Sep 17 00:00:00 2001 From: Alan CHUNG Date: Tue, 26 Mar 2024 14:03:54 +0800 Subject: [PATCH 08/20] specify directory on patch file 106 --- patches/patches/106_files.patch | Bin 2442 -> 2470 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/patches/patches/106_files.patch b/patches/patches/106_files.patch index bee61205ea54e10120a624e46b219fc996d45d18..62fa3f983a3edce56abbe2062ed42aa7db5a6235 100644 GIT binary patch delta 56 zcmeAYUM4L4|DP@c2r4k7GE@L@5koRVCPOihRXmZ~mN$_h56CG8O8^B-H`eiR0sxld B4c`C& delta 28 hcmZ1`+$GHY|DP@c2r4inPL#G~OqwWdx^Wf{CjfeY2lM~{ From 5f74c7f9115cddfadfba3afb34262665544b1324 Mon Sep 17 00:00:00 2001 From: Alan CHUNG Date: Tue, 26 Mar 2024 14:05:16 +0800 Subject: [PATCH 09/20] specify directory on patch file 106 --- patches/patches/106_files.patch | Bin 2470 -> 2430 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/patches/patches/106_files.patch b/patches/patches/106_files.patch index 62fa3f983a3edce56abbe2062ed42aa7db5a6235..500f9a7d2590e8c81e1008246a531e2f1f59c2b4 100644 GIT binary patch delta 19 bcmZ1`{7-0t+{7BWi2)K5jpR1Y;^71UOX>#Q delta 16 Xcmew-v`lz{+(a&~iCjh-i+DHzG|vTM From 69bc9a072349b5e712b709c238daceec211d6687 Mon Sep 17 00:00:00 2001 From: Alan CHUNG Date: Tue, 26 Mar 2024 14:33:25 +0800 Subject: [PATCH 10/20] Pass CI test locally --- patches/patches/106_files.patch | Bin 2430 -> 1203 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/patches/patches/106_files.patch b/patches/patches/106_files.patch index 500f9a7d2590e8c81e1008246a531e2f1f59c2b4..3fad9398151ae4ba39ccf1c6d524eac604261832 100644 GIT binary patch literal 1203 zcmah|+iuf95Pi>AoaBX6Nn8+Z5mY5bf(PFCgLY$&;{|uu+8yJVs{hW+I*uzO+DLJn zo$;A-8E-Zl(1Aj3BgOM~Z?Eo3TT{&b*!^s^TEV#3QTVrVdyCEc%k@XB(pCO8?GB~G zgRyRThWT%A3p~y+e$LOa>rr^?_Hdpn`F&n|evgjO8OLCc+;CojLhvE`VYvEI2Qo$f z?O-EE;Z_Lb32!qF+ithG`7Gm4Ct8uy>*?faJzI_a|HDrhr!MUd#BFfb)1v}2qChm- z5>|Qj5RDYjIyy9zGZljf)%LTEj3)TT>~wE;KCyCTy$@^85qx)y6>k56Yu`(AmTh0{wIm{=0D zS=L48iJJu7Vcg3O*CI3H1K%Gl6!E$>ll|JA@<-cfd>R|U=vPuqm6%+=Os=QvtFG@_ zPEM(53MCtlo>&ZYvfIJ3nlF4uswXKzz`I(sOf2w=`p$;})`xc9W zN(u|)z7RnN$|dh{1c_o_BIe>xmSsbHYEhQgKGJebBtazarov?NT*r)RhQT5sc2-|e zd7~q^^AN*H?mTu>dXb)z&@n1mi^uI6(%&?WtA)3Fvjdq9%FSN-(-gM2=i<6LowSO zC-7ZiVT1R`q^Iy%VPhtx-^;yhrkpJHyJx2c3aB_^8P0t^FR#=|`(Y4I+9s@cqhWY%~tZq<~tfZd8YYO8>--mIJ@Bw2f`KtE?T$)5O~8f$8ug~b)@KW(tTp8pT_ z4~#Erh`2A#yYS3=yuv$Hr}L40g8VEHQCT4tojalrY}**`IFPv$i@F^Vm9MyGgL_z0 zM4P$MDpQUl>!$67J}gh5w}Sk}*sNgn2=+2O1?FV`%y!~iJv1boH~ex$B&>GcKC|pC zOpiSvvBBHxdW@(ONb!F5H-2aLtETp(W?{QdJHHRMQSIlc8M*VG|0S3w|C%x?ek&Ot zkyZFfT=@?rayY;$! Date: Wed, 27 Mar 2024 16:40:24 +0800 Subject: [PATCH 11/20] 106 & 107 --- build.zig | 9 +++++- exercises/106_files.zig | 9 +++--- exercises/107_files2.zig | 52 ++++++++++++++++++++++++++++++++ patches/patches/106_files.patch | 24 ++++++--------- patches/patches/107_files2.patch | 26 ++++++++++++++++ 5 files changed, 100 insertions(+), 20 deletions(-) create mode 100644 exercises/107_files2.zig create mode 100644 patches/patches/107_files2.patch diff --git a/build.zig b/build.zig index 4517ff6..3c3d414 100644 --- a/build.zig +++ b/build.zig @@ -1123,7 +1123,14 @@ const exercises = [_]Exercise{ }, .{ .main_file = "106_files.zig", - .output = "Succefully wrote 18 bytes.", + .output = "Successfully wrote 18 bytes.", + }, + .{ + .main_file = "107_files2.zig", + .output = + \\AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + \\Successfully Read 18 byte: It's zigling time! + , }, .{ .main_file = "999_the_end.zig", diff --git a/exercises/106_files.zig b/exercises/106_files.zig index b590679..78e6611 100644 --- a/exercises/106_files.zig +++ b/exercises/106_files.zig @@ -35,9 +35,7 @@ pub fn main() !void { // by doing nothing // // we want to catch error.PathAlreadyExists and do nothing - ??? => { - ???; - }, + ??? => {}, // if is any other unexpected error we just propagate it through else => return e, }; @@ -46,7 +44,8 @@ pub fn main() !void { // wait a minute // opening a directory might fail! // what should we do here? - const output_dir: std.fs.Dir = cwd.openDir("output", .{}); + var output_dir: std.fs.Dir = cwd.openDir("output", .{}); + defer output_dir.close(); // we try to open the file `zigling.txt`, // and propagate the error up if there are any errors @@ -60,7 +59,7 @@ pub fn main() !void { // !you are not allow to switch this two lines to before file closing line! const byte_written = try file.write("It's zigling time!"); - std.debug.print("Succefully wrote {} bytes.\n", .{byte_written}); + std.debug.print("Successfully wrote {} bytes.\n", .{byte_written}); } // to check if you actually write to the file, you can either, // 1. open the file on your text editor, or diff --git a/exercises/107_files2.zig b/exercises/107_files2.zig new file mode 100644 index 0000000..18d59ef --- /dev/null +++ b/exercises/107_files2.zig @@ -0,0 +1,52 @@ +// +// Prerequisite : +// - exercise/106_files.zig, or +// - create a file {project_root}/output/zigling.txt +// with content `It's zigling time!`(18 byte total) +// +// Now there no point in writing to a file if we don't read from it am I right? +// let's wrote a program to read the content of the file that we just created. +// +// I am assuming you've created the appropriate files for this to work. +// +// Alright, bud, lean in close here's the game plan. +// - First, we open the {project_root}/output/ directory +// - Secondly, we open file `zigling.txt` in that directory +// - then, we initalize an array of character with all letter 'A', and print it +// - Afte that, we read the content of the file to the array +// - Finally, we print out the read content + +const std = @import("std"); + +pub fn main() !void { + // Get the current working directory + const cwd = std.fs.cwd(); + + // try to open ./output assuming you did your 106_files exercise + var output_dir = try cwd.openDir("output", .{}); + defer output_dir.close(); + + // try to open the file + const file = try output_dir.openFile("zigling.txt", .{}); + defer file.close(); + + // initalize an array of u8 with all letter 'A'. + // we need to pick a size of the array, 64 seems like a good number. + // fix the initalization below + var content = ['A']*64; + // this should print out : `AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA` + std.debug.print("{s}\n", .{content}); + + // okay, seem like threat of violence is not the answer in this case + // can you go here to find a way to read the content ? + // https://ziglang.org/documentation/master/std/#std.fs.File + // hint: you might find two answer that are both vaild in this case + const byte_read = zig_read_the_file_or_i_will_fight_you(&content); + + // Woah, too screamy, I know you're excited for zigling time but tone it down a bit + // Can you print only what we read from the file ? + std.debug.print("Successfully Read {} byte: {s}\n", .{ + byte_read, + content, // change this line only + }); +} diff --git a/patches/patches/106_files.patch b/patches/patches/106_files.patch index 3fad939..ffe18ac 100644 --- a/patches/patches/106_files.patch +++ b/patches/patches/106_files.patch @@ -1,28 +1,24 @@ ---- exercises/106_files.zig -+++ answers/106_files.zig -@@ -35,9 +35,9 @@ pub fn main() !void { +--- exercises/106_files.zig 2024-03-27 16:36:44.593077000 +0800 ++++ answers/106_files.zig 2024-03-27 16:36:31.548155100 +0800 +@@ -35,7 +35,7 @@ // by doing nothing // // we want to catch error.PathAlreadyExists and do nothing -- ??? => { -- ???; -- }, -+ error.PathAlreadyExists => { -+ return; -+ }, +- ??? => {}, ++ error.PathAlreadyExists => {}, // if is any other unexpected error we just propagate it through else => return e, }; -@@ -46,7 +46,7 @@ pub fn main() !void { +@@ -44,7 +44,7 @@ // wait a minute // opening a directory might fail! // what should we do here? -- const output_dir: std.fs.Dir = cwd.openDir("output", .{}); -+ const output_dir: std.fs.Dir = try cwd.openDir("output", .{}); +- var output_dir: std.fs.Dir = cwd.openDir("output", .{}); ++ var output_dir: std.fs.Dir = try cwd.openDir("output", .{}); + defer output_dir.close(); // we try to open the file `zigling.txt`, - // and propagate the error up if there are any errors -@@ -56,7 +56,7 @@ pub fn main() !void { +@@ -55,7 +55,7 @@ // but here we are not yet done writing to the file // if only there are a keyword in zig that // allow you "defer" code execute to the end of scope... diff --git a/patches/patches/107_files2.patch b/patches/patches/107_files2.patch new file mode 100644 index 0000000..a275c70 --- /dev/null +++ b/patches/patches/107_files2.patch @@ -0,0 +1,26 @@ +--- exercises/107_files2.zig 2024-03-27 16:36:56.733062700 +0800 ++++ answers/107_files2.zig 2024-03-27 16:36:52.894505100 +0800 +@@ -33,7 +33,7 @@ + // initalize an array of u8 with all letter 'A'. + // we need to pick a size of the array, 64 seems like a good number. + // fix the initalization below +- var content = ['A']*64; ++ var content = [_]u8{'A'} ** 64; + // this should print out : `AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA` + std.debug.print("{s}\n", .{content}); + +@@ -41,12 +41,12 @@ + // can you go here to find a way to read the content ? + // https://ziglang.org/documentation/master/std/#std.fs.File + // hint: you might find two answer that are both vaild in this case +- const byte_read = zig_read_the_file_or_i_will_fight_you(&content); ++ const byte_read = try file.read(&content); + + // Woah, too screamy, I know you're excited for zigling time but tone it down a bit + // Can you print only what we read from the file ? + std.debug.print("Successfully Read {} byte: {s}\n", .{ + byte_read, +- content, // change this line only ++ content[0..byte_read], // change this line only + }); + } From 05589f8ba1f7a419712a15e3385bd4f0180fb48c Mon Sep 17 00:00:00 2001 From: Alan CHUNG Date: Wed, 27 Mar 2024 16:53:19 +0800 Subject: [PATCH 12/20] added format parameter {d} --- exercises/106_files.zig | 2 +- exercises/107_files2.zig | 2 +- patches/patches/106_files.patch | 4 ++-- patches/patches/107_files2.patch | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/exercises/106_files.zig b/exercises/106_files.zig index 78e6611..aa58ee0 100644 --- a/exercises/106_files.zig +++ b/exercises/106_files.zig @@ -59,7 +59,7 @@ pub fn main() !void { // !you are not allow to switch this two lines to before file closing line! const byte_written = try file.write("It's zigling time!"); - std.debug.print("Successfully wrote {} bytes.\n", .{byte_written}); + std.debug.print("Successfully wrote {d} bytes.\n", .{byte_written}); } // to check if you actually write to the file, you can either, // 1. open the file on your text editor, or diff --git a/exercises/107_files2.zig b/exercises/107_files2.zig index 18d59ef..dadfdf6 100644 --- a/exercises/107_files2.zig +++ b/exercises/107_files2.zig @@ -45,7 +45,7 @@ pub fn main() !void { // Woah, too screamy, I know you're excited for zigling time but tone it down a bit // Can you print only what we read from the file ? - std.debug.print("Successfully Read {} byte: {s}\n", .{ + std.debug.print("Successfully Read {d} byte: {s}\n", .{ byte_read, content, // change this line only }); diff --git a/patches/patches/106_files.patch b/patches/patches/106_files.patch index ffe18ac..7927cee 100644 --- a/patches/patches/106_files.patch +++ b/patches/patches/106_files.patch @@ -1,5 +1,5 @@ ---- exercises/106_files.zig 2024-03-27 16:36:44.593077000 +0800 -+++ answers/106_files.zig 2024-03-27 16:36:31.548155100 +0800 +--- exercises/106_files.zig 2024-03-27 16:52:05.660910200 +0800 ++++ answers/106_files.zig 2024-03-27 16:52:09.649422200 +0800 @@ -35,7 +35,7 @@ // by doing nothing // diff --git a/patches/patches/107_files2.patch b/patches/patches/107_files2.patch index a275c70..57e04e7 100644 --- a/patches/patches/107_files2.patch +++ b/patches/patches/107_files2.patch @@ -1,5 +1,5 @@ ---- exercises/107_files2.zig 2024-03-27 16:36:56.733062700 +0800 -+++ answers/107_files2.zig 2024-03-27 16:36:52.894505100 +0800 +--- exercises/107_files2.zig 2024-03-27 16:51:56.199719600 +0800 ++++ answers/107_files2.zig 2024-03-27 16:52:01.650935300 +0800 @@ -33,7 +33,7 @@ // initalize an array of u8 with all letter 'A'. // we need to pick a size of the array, 64 seems like a good number. @@ -18,7 +18,7 @@ // Woah, too screamy, I know you're excited for zigling time but tone it down a bit // Can you print only what we read from the file ? - std.debug.print("Successfully Read {} byte: {s}\n", .{ + std.debug.print("Successfully Read {d} byte: {s}\n", .{ byte_read, - content, // change this line only + content[0..byte_read], // change this line only From 86ac326885888c992aa206051220878c4a34579b Mon Sep 17 00:00:00 2001 From: Chris Boesch Date: Thu, 28 Mar 2024 21:33:16 +0100 Subject: [PATCH 13/20] fix typo --- exercises/105_threading2.zig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/exercises/105_threading2.zig b/exercises/105_threading2.zig index a211551..ac3cdfb 100644 --- a/exercises/105_threading2.zig +++ b/exercises/105_threading2.zig @@ -46,7 +46,7 @@ // 1,000,000,000 partial values. And for each additional digit we have to // add a zero. // Even fast computers - and I mean really fast computers - get a bit warmer -// on the CPU when it comes to really many diggits. But the 8 digits are +// on the CPU when it comes to really many digits. But the 8 digits are // enough for us for now, because we want to understand the principle and // nothing more, right? // From f06c1f27d13b3ec380049ef58e5e8eee566172ac Mon Sep 17 00:00:00 2001 From: kamidev <1655+kamidev@users.noreply.github.com> Date: Sun, 31 Mar 2024 14:55:32 +0200 Subject: [PATCH 14/20] Fix breaking zig change to @fieldParentPtr parameters See https://github.com/ziglang/zig/pull/19470 --- build.zig | 5 ++--- test/tests.zig | 8 ++++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/build.zig b/build.zig index 3c3d414..1a49a53 100644 --- a/build.zig +++ b/build.zig @@ -247,7 +247,7 @@ const ZiglingStep = struct { fn make(step: *Step, prog_node: *std.Progress.Node) !void { // NOTE: Using exit code 2 will prevent the Zig compiler to print the message: // "error: the following build command failed with exit code 1:..." - const self = @fieldParentPtr(ZiglingStep, "step", step); + const self: *ZiglingStep = @alignCast(@fieldParentPtr("step", step)); if (self.exercise.skip) { print("Skipping {s}\n\n", .{self.exercise.main_file}); @@ -495,8 +495,7 @@ const PrintStep = struct { } fn make(step: *Step, _: *std.Progress.Node) !void { - const self = @fieldParentPtr(PrintStep, "step", step); - + const self: *PrintStep = @alignCast(@fieldParentPtr("step", step)); print("{s}", .{self.message}); } }; diff --git a/test/tests.zig b/test/tests.zig index 9ab15b3..5ee5365 100644 --- a/test/tests.zig +++ b/test/tests.zig @@ -152,7 +152,7 @@ const CheckNamedStep = struct { fn make(step: *Step, _: *std.Progress.Node) !void { const b = step.owner; - const self = @fieldParentPtr(CheckNamedStep, "step", step); + const self: *CheckNamedStep = @alignCast(@fieldParentPtr("step", step)); const ex = self.exercise; const stderr_file = try fs.cwd().openFile( @@ -204,7 +204,7 @@ const CheckStep = struct { fn make(step: *Step, _: *std.Progress.Node) !void { const b = step.owner; - const self = @fieldParentPtr(CheckStep, "step", step); + const self: *CheckStep = @alignCast(@fieldParentPtr("step", step)); const exercises = self.exercises; const stderr_file = try fs.cwd().openFile( @@ -327,7 +327,7 @@ const FailStep = struct { fn make(step: *Step, _: *std.Progress.Node) !void { const b = step.owner; - const self = @fieldParentPtr(FailStep, "step", step); + const self: *FailStep = @alignCast(@fieldParentPtr("step", step)); try step.result_error_msgs.append(b.allocator, self.error_msg); return error.MakeFailed; @@ -370,7 +370,7 @@ const HealStep = struct { fn make(step: *Step, _: *std.Progress.Node) !void { const b = step.owner; - const self = @fieldParentPtr(HealStep, "step", step); + const self: *HealStep = @alignCast(@fieldParentPtr("step", step)); return heal(b.allocator, self.exercises, self.work_path); } From 7875a0f9aaf450f6944e9226755d4ac5abfa2720 Mon Sep 17 00:00:00 2001 From: Chris Boesch Date: Wed, 3 Apr 2024 00:37:33 +0200 Subject: [PATCH 15/20] Zig version changed --- README.md | 3 ++- build.zig | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index d7945a7..02d9401 100644 --- a/README.md +++ b/README.md @@ -96,7 +96,8 @@ that if you update one, you may need to also update the other. ### Version Changes -Version-0.12.0-dev.3397 +Version-0.12.0-dev.3518 +* *2024-03-21* zig 0.12.0-dev.3518 - change to @fieldParentPtr - see [#19470](https://github.com/ziglang/zig/pull/19470) * *2024-03-21* zig 0.12.0-dev.3397 - rename std.os to std.posix - see [#5019](https://github.com/ziglang/zig/issues/5019) * *2024-03-14* zig 0.12.0-dev.3302 - changes in `std.fmt` - floating-point formatting implementation - see [#19229](https://github.com/ziglang/zig/pull/19229) * *2024-02-05* zig 0.12.0-dev.2618 - changes in `build system` - from `Step.zig_exe` to `Step.graph.zig_exe` - see [#18778](https://github.com/ziglang/zig/issues/18778) diff --git a/build.zig b/build.zig index 1a49a53..7620db0 100644 --- a/build.zig +++ b/build.zig @@ -15,7 +15,7 @@ const print = std.debug.print; // 1) Getting Started // 2) Version Changes comptime { - const required_zig = "0.12.0-dev.3397"; + const required_zig = "0.12.0-dev.3518"; const current_zig = builtin.zig_version; const min_zig = std.SemanticVersion.parse(required_zig) catch unreachable; if (current_zig.order(min_zig) == .lt) { From 564916db81e4f748f430528c5366673504221c1b Mon Sep 17 00:00:00 2001 From: Chris Boesch Date: Wed, 3 Apr 2024 07:51:19 +0000 Subject: [PATCH 16/20] Update README.md --- README.md | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/README.md b/README.md index 02d9401..2cd5778 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,4 @@ # Ziglings -# ⚠️ Ziglings has moved from GitHub to Codeberg! - -You are looking at the current Ziglings repo if you are viewing -this at https://codeberg.org/ziglings/exercises/ - -You can also use the handy URL https://ziglings.org to get here! - -*** Welcome to Ziglings! This project contains a series of tiny broken programs (and one nasty surprise). By fixing them, you'll @@ -226,6 +218,7 @@ Zig Standard Library * [X] String formatting * [X] Testing * [X] Tokenization +* [X] File handling ## Contributing From 7732cd7716236dcdf42b205d7983af6b12bba68b Mon Sep 17 00:00:00 2001 From: Chris Boesch Date: Wed, 10 Apr 2024 16:06:23 +0200 Subject: [PATCH 17/20] Greater gradation of timers built into the threads --- exercises/104_threading.zig | 6 +++++- patches/patches/104_threading.patch | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/exercises/104_threading.zig b/exercises/104_threading.zig index 8aeb683..7865839 100644 --- a/exercises/104_threading.zig +++ b/exercises/104_threading.zig @@ -118,7 +118,11 @@ pub fn main() !void { // In our example, we pass the number of the thread as a parameter. fn thread_function(num: usize) !void { std.debug.print("thread {d}: {s}\n", .{ num, "started." }); - std.time.sleep((5 - num % 3) * std.time.ns_per_s); + + // This timer simulates the work of the thread. + const work_time = 2 * ((5 - num % 3) - 2); + std.time.sleep(work_time * std.time.ns_per_s); + std.debug.print("thread {d}: {s}\n", .{ num, "finished." }); } // This is the easiest way to run threads in parallel. diff --git a/patches/patches/104_threading.patch b/patches/patches/104_threading.patch index 58410a8..304d39f 100644 --- a/patches/patches/104_threading.patch +++ b/patches/patches/104_threading.patch @@ -1,5 +1,5 @@ ---- exercises/104_threading.zig 2024-03-05 09:09:04.013974229 +0100 -+++ answers/104_threading.zig 2024-03-05 09:12:03.987162883 +0100 +--- exercises/104_threading.zig 2024-04-10 16:02:33.680771772 +0200 ++++ answers/104_threading.zig 2024-04-10 16:01:00.042331517 +0200 @@ -97,12 +97,12 @@ defer handle.join(); From ba2a9622c46b2410a90831b7b71dd2c2ffefb439 Mon Sep 17 00:00:00 2001 From: Chris Boesch Date: Wed, 10 Apr 2024 19:13:46 +0200 Subject: [PATCH 18/20] Additional timer in thread start added --- exercises/104_threading.zig | 5 +++-- patches/patches/104_threading.patch | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/exercises/104_threading.zig b/exercises/104_threading.zig index 7865839..ac40b3c 100644 --- a/exercises/104_threading.zig +++ b/exercises/104_threading.zig @@ -106,7 +106,7 @@ pub fn main() !void { // After the threads have been started, // they run in parallel and we can still do some work in between. - std.time.sleep((1) * std.time.ns_per_s); + std.time.sleep(1500 * std.time.ns_per_ms); std.debug.print("Some weird stuff, after starting the threads.\n", .{}); } // After we have left the closed area, we wait until @@ -117,10 +117,11 @@ pub fn main() !void { // This function is started with every thread that we set up. // In our example, we pass the number of the thread as a parameter. fn thread_function(num: usize) !void { + std.time.sleep(200 * num * std.time.ns_per_ms); std.debug.print("thread {d}: {s}\n", .{ num, "started." }); // This timer simulates the work of the thread. - const work_time = 2 * ((5 - num % 3) - 2); + const work_time = 3 * ((5 - num % 3) - 2); std.time.sleep(work_time * std.time.ns_per_s); std.debug.print("thread {d}: {s}\n", .{ num, "finished." }); diff --git a/patches/patches/104_threading.patch b/patches/patches/104_threading.patch index 304d39f..1ca46c1 100644 --- a/patches/patches/104_threading.patch +++ b/patches/patches/104_threading.patch @@ -1,5 +1,5 @@ ---- exercises/104_threading.zig 2024-04-10 16:02:33.680771772 +0200 -+++ answers/104_threading.zig 2024-04-10 16:01:00.042331517 +0200 +--- exercises/104_threading.zig 2024-04-10 19:12:29.878856370 +0200 ++++ answers/104_threading.zig 2024-04-10 19:11:22.304265713 +0200 @@ -97,12 +97,12 @@ defer handle.join(); From 72e3d6ebdc8b5ff231bdc8cc33b73cf109de3df5 Mon Sep 17 00:00:00 2001 From: Chris Boesch Date: Wed, 10 Apr 2024 18:38:59 +0000 Subject: [PATCH 19/20] Update .woodpecker/eowyn.yml --- .woodpecker/eowyn.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.woodpecker/eowyn.yml b/.woodpecker/eowyn.yml index ba505f7..1ec8337 100644 --- a/.woodpecker/eowyn.yml +++ b/.woodpecker/eowyn.yml @@ -5,8 +5,4 @@ steps: commands: - sh ./patches/eowyn.sh when: - events: - - push - - pull-requests - - cron - cron: "Daily" + event: [ push, cron ] From f4f8eb7ff1aca9a9c52045f34140e4ea2edf97ba Mon Sep 17 00:00:00 2001 From: Chris Boesch Date: Wed, 10 Apr 2024 22:56:33 +0200 Subject: [PATCH 20/20] Fixed woodpecker warnings --- .woodpecker/eowyn.yaml | 8 ++++++++ .woodpecker/eowyn.yml | 8 -------- 2 files changed, 8 insertions(+), 8 deletions(-) create mode 100644 .woodpecker/eowyn.yaml delete mode 100644 .woodpecker/eowyn.yml diff --git a/.woodpecker/eowyn.yaml b/.woodpecker/eowyn.yaml new file mode 100644 index 0000000..f6eceb0 --- /dev/null +++ b/.woodpecker/eowyn.yaml @@ -0,0 +1,8 @@ +steps: + - name: eowyn + image: ziglings/ziglang + commands: + - sh ./patches/eowyn.sh + when: + event: [push, cron] + cron: daily* diff --git a/.woodpecker/eowyn.yml b/.woodpecker/eowyn.yml deleted file mode 100644 index 1ec8337..0000000 --- a/.woodpecker/eowyn.yml +++ /dev/null @@ -1,8 +0,0 @@ -steps: - eowyn: - image: ziglings/ziglang:latest - pull: true - commands: - - sh ./patches/eowyn.sh - when: - event: [ push, cron ]