a/ziglings
1
0
Fork 0
mirror of https://codeberg.org/andyscott/ziglings.git synced 2024-11-08 11:20:46 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request 'Fixes because of a new Zig version, which changes some functions.' (#114) from patch-106 into main

Browse source 
Reviewed-on: https://codeberg.org/ziglings/exercises/pulls/114
This commit is contained in:
Chris Boesch 2024-06-17 10:14:13 +00:00
commit da46008761
4 changed files with 125 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
README.md
View file

@ -88,7 +88,8 @@ that if you update one, you may need to also update the other.
### Version Changes
Version-0.13.0-dev.339
Version-0.14.0-dev.42
* *2024-06-17* zig 0.14.0-dev.42 - changes in `std.mem.split and tokenize` - see [#15579](https://github.com/ziglang/zig/pull/15579)
* *2024-05-29* zig 0.13.0-dev.339 - rework std.Progress - see [#20059](https://github.com/ziglang/zig/pull/20059)
* *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)

2
build.zig
View file

@ -15,7 +15,7 @@ const print = std.debug.print;
// 1) Getting Started
// 2) Version Changes
comptime {
const required_zig = "0.13.0-dev.339";
const required_zig = "0.14.0-dev.42";
const current_zig = builtin.zig_version;
const min_zig = std.SemanticVersion.parse(required_zig) catch unreachable;
if (current_zig.order(min_zig) == .lt) {

91
patches/patches/106_files.patch
View file

@ -1,16 +1,63 @@
--- exercises/106_files.zig 2024-05-05 00:48:25.808548611 +0200
+++ answers/106_files.zig 2024-05-05 01:00:40.742969819 +0200
@@ -35,7 +35,7 @@
--- exercises/106_files.zig 2024-06-17 10:11:53.651439869 +0200
+++ answers/106_files.zig 2024-06-17 10:21:50.697337653 +0200
@@ -1,22 +1,22 @@
//
// Until now, we've only been printing our output in the console,
-// which is good enough for fighting aliens and hermit bookkeeping.
+// which is good enough for fighting alien and hermit bookkeeping.
//
-// However, many other tasks require some interaction with the file system,
+// 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 provides a hierarchical structure for storing files
-// by organizing them into directories, which hold files and other directories,
-// thus creating a tree structure that can be navigated.
+// 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, the Zig standard library provides a simple API for interacting
-// with the file system, see the detail documentation here:
+// 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,
+// 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
@@ -27,42 +27,42 @@
const cwd: std.fs.Dir = std.fs.cwd();
// then we'll try to make a new directory /output/
- // to store our output files.
+ // to put our output files.
cwd.makeDir("output") catch |e| switch (e) {
- // there is a chance you might want to run this
+ // there are chance you might want to run this
// program more than once and the path might already
- // have been created, so we'll have to handle this error
+ // been created, so we'll have to handle this error
// by doing nothing
//
// we want to catch error.PathAlreadyExists and do nothing
- ??? => {},
- // if there's any other unexpected error we just propagate it through
+ error.PathAlreadyExists => {},
// if is any other unexpected error we just propagate it through
+ // if is any other unexpected error we just propagate it through
else => return e,
};
@@ -44,7 +44,7 @@
// wait a minute
// then we'll try to open our freshly created directory
- // wait a minute...
+ // wait a minute
// opening a directory might fail!
// what should we do here?
- var output_dir: std.fs.Dir = cwd.openDir("output", .{});
@ -18,12 +65,36 @@
defer output_dir.close();
// we try to open the file `zigling.txt`,
@@ -55,7 +55,7 @@
- // and propagate any error up
+ // 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 it
// so that other programs can read it and prevent data corruption
// but here we are not yet done writing to the file
// if only there were a keyword in zig that
// allows you "defer" code execute to the end of scope...
- // if only there were a keyword in Zig that
- // allowed you to "defer" code execution to the end of the scope...
- file.close();
+ // if only there were a keyword in zig that
+ // allows you "defer" code execute to the end of scope...
+ defer file.close();
// !you are not allowed to switch these two lines above the file closing line!
- // you are not allowed to move these two lines above the file closing line!
+ // !you are not allowed to switch these two lines above the file closing line!
const byte_written = try file.write("It's zigling time!");
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 in your text editor, or
+// 1. open the file on your text editor, or
// 2. print the content of the file in the console with the following command
// >> cat ./output/zigling.txt
//
@@ -86,7 +86,7 @@
//
// Question:
// - what should you do if you want to also read the file after opening it?
-// - go to the documentation of the struct `std.fs.Dir` here:
+// - 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 options can you use with those functions?

50
patches/patches/107_files2.patch
View file

@ -1,23 +1,55 @@
--- exercises/107_files2.zig 2024-05-05 00:48:25.808548611 +0200
+++ answers/107_files2.zig 2024-05-05 01:14:03.866062288 +0200
@@ -33,7 +33,7 @@
// initalize an array of u8 with all letter 'A'.
// we need to pick the size of the array, 64 seems like a good number.
--- exercises/107_files2.zig 2024-06-17 10:11:53.651439869 +0200
+++ answers/107_files2.zig 2024-06-17 10:21:50.700671057 +0200
@@ -4,17 +4,17 @@
// - create a file {project_root}/output/zigling.txt
// with content `It's zigling time!`(18 byte total)
//
-// Now there's no point in writing to a file if we don't read from it, am I right?
-// Let's write a program to read the content of the file that we just created.
+// Now there no point in writing to a file if we don't read from it am I right?
+// let's write a program to read the content of the file that we just created.
//
// I am assuming that you've created the appropriate files for this to work.
//
-// Alright, bud, lean in close. Here's the game plan.
+// 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 characters with all letter 'A', and print it
-// - After that, we read the content of the file into the array
-// - Finally, we print out the content we just read
+// - then, we initalize an array of characters with all letter 'A', and print it
+// - After that, we read the content of the file to the array
+// - Finally, we print out the read content
const std = @import("std");
@@ -30,23 +30,23 @@
const file = try output_dir.openFile("zigling.txt", .{});
defer file.close();
- // initalize an array of u8 with all letter 'A'
- // we need to pick the size of the array, 64 seems like a good number
+ // initalize an array of u8 with all letter 'A'.
+ // we need to pick the 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 ?
// okay, seems like a threat of violence is not the answer in this case
- // can you go here to find a way to read the content?
+ // 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 answers that are both vaild in this case
- const bytes_read = zig_read_the_file_or_i_will_fight_you(&content);
+ const bytes_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 ?
- // 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?
+ // 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 {d} bytes: {s}\n", .{
bytes_read,
- content, // change this line only