aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Gauer <dave@ratfactor.com>2021-02-14 10:50:03 -0500
committerDave Gauer <dave@ratfactor.com>2021-02-14 10:50:03 -0500
commit93050efc73e26be85334d941bdc14d19d58df1ca (patch)
tree779373337f1f56e24709cbb89a597bb0ff3d6838
parentacaf051e4cad70f17e48cd595f7908dfdb2914d6 (diff)
parent74a1d3bc43a4d2e6f82e42ee58f49293a5ea3f30 (diff)
downloadziglings-93050efc73e26be85334d941bdc14d19d58df1ca.tar.gz
ziglings-93050efc73e26be85334d941bdc14d19d58df1ca.tar.bz2
ziglings-93050efc73e26be85334d941bdc14d19d58df1ca.tar.xz
ziglings-93050efc73e26be85334d941bdc14d19d58df1ca.zip
Merge branch 'main' of github.com:ratfactor/ziglings into main
-rw-r--r--exercises/03_assignment.zig3
-rw-r--r--exercises/04_arrays.zig2
-rw-r--r--exercises/09_if.zig2
3 files changed, 5 insertions, 2 deletions
diff --git a/exercises/03_assignment.zig b/exercises/03_assignment.zig
index d26f2a2..662fd18 100644
--- a/exercises/03_assignment.zig
+++ b/exercises/03_assignment.zig
@@ -20,6 +20,9 @@
// Example: foo can hold 8 bits (0 to 255)
// bar can hold 16 bits (0 to 65,535)
//
+// const foo: u8 = 20;
+// const bar: u16 = 2000;
+//
// You can do just about any combination of these that you can think of:
//
// u32 can hold 0 to 4,294,967,295
diff --git a/exercises/04_arrays.zig b/exercises/04_arrays.zig
index b8eeb9d..c1e9fd9 100644
--- a/exercises/04_arrays.zig
+++ b/exercises/04_arrays.zig
@@ -1,7 +1,7 @@
//
// Let's learn some array basics. Arrays are declared with:
//
-// var foo [3]u32 = [3]u32{ 42, 108, 5423 };
+// var foo: [3]u32 = [3]u32{ 42, 108, 5423 };
//
// When Zig can infer the size of the array, you can use '_' for the
// size. You can also let Zig infer the type of the value so the
diff --git a/exercises/09_if.zig b/exercises/09_if.zig
index 28ac712..a472e48 100644
--- a/exercises/09_if.zig
+++ b/exercises/09_if.zig
@@ -24,7 +24,7 @@ pub fn main() void {
// Please fix this condition:
if (foo) {
- // We want out program to print this message!
+ // We want our program to print this message!
std.debug.print("Foo is 1!\n", .{});
} else {
std.debug.print("Foo is not 1!\n", .{});