diff options
Diffstat (limited to 'exercises')
| -rw-r--r-- | exercises/042_pointers4.zig | 2 | ||||
| -rw-r--r-- | exercises/060_floats.zig | 4 | ||||
| -rw-r--r-- | exercises/064_builtins.zig | 6 | ||||
| -rw-r--r-- | exercises/065_builtins2.zig | 2 | ||||
| -rw-r--r-- | exercises/071_comptime6.zig | 2 | ||||
| -rw-r--r-- | exercises/082_anonymous_structs3.zig | 6 |
6 files changed, 10 insertions, 12 deletions
diff --git a/exercises/042_pointers4.zig b/exercises/042_pointers4.zig index 359a2f1..1f6db70 100644 --- a/exercises/042_pointers4.zig +++ b/exercises/042_pointers4.zig @@ -17,7 +17,7 @@ pub fn main() void { var num: u8 = 1; var more_nums = [_]u8{ 1, 1, 1, 1 }; - // Let's pass a reference to num to our function and print it: + // Let's pass the num reference to our function and print it: makeFive(&num); std.debug.print("num: {}, ", .{num}); diff --git a/exercises/060_floats.zig b/exercises/060_floats.zig index a223257..8ba51db 100644 --- a/exercises/060_floats.zig +++ b/exercises/060_floats.zig @@ -1,7 +1,7 @@ // // Zig has support for IEEE-754 floating-point numbers in these -// specific sizes: f16, f32, f64, f128. Floating point literals -// may be writen in scientific notation: +// specific sizes: f16, f32, f64, f80, and f128. Floating point +// literals may be written in scientific notation: // // const a1: f32 = 1200.0; // 1,200 // const a2: f32 = 1.2e+3; // 1,200 diff --git a/exercises/064_builtins.zig b/exercises/064_builtins.zig index 1a0d263..85d1aa7 100644 --- a/exercises/064_builtins.zig +++ b/exercises/064_builtins.zig @@ -38,14 +38,12 @@ pub fn main() void { // Let's try it with a tiny 4-bit integer size to make it clear: const a: u4 = 0b1101; const b: u4 = 0b0101; - var my_result: u4 = undefined; - var overflowed: bool = undefined; - overflowed = @addWithOverflow(u4, a, b, &my_result); + const my_result = @addWithOverflow(a, b); // Check out our fancy formatting! b:0>4 means, "print // as a binary number, zero-pad right-aligned four digits." // The print() below will produce: "1101 + 0101 = 0010 (true)". - print("{b:0>4} + {b:0>4} = {b:0>4} ({})", .{ a, b, my_result, overflowed }); + print("{b:0>4} + {b:0>4} = {b:0>4} ({s})", .{ a, b, my_result[0], if (my_result[1] == 1) "true" else "false" }); // Let's make sense of this answer. The value of 'b' in decimal is 5. // Let's add 5 to 'a' but go one by one and see where it overflows: diff --git a/exercises/065_builtins2.zig b/exercises/065_builtins2.zig index a0f9160..7d3e770 100644 --- a/exercises/065_builtins2.zig +++ b/exercises/065_builtins2.zig @@ -100,7 +100,7 @@ pub fn main() void { // // pub const StructField = struct { // name: []const u8, - // field_type: type, + // type: type, // default_value: anytype, // is_comptime: bool, // alignment: comptime_int, diff --git a/exercises/071_comptime6.zig b/exercises/071_comptime6.zig index f764590..7723291 100644 --- a/exercises/071_comptime6.zig +++ b/exercises/071_comptime6.zig @@ -41,7 +41,7 @@ pub fn main() void { const fields = @typeInfo(Narcissus).Struct.fields; ??? { - if (field.field_type != void) { + if (field.type != void) { print(" {s}", .{field.name}); } } diff --git a/exercises/082_anonymous_structs3.zig b/exercises/082_anonymous_structs3.zig index 8344321..6760ff3 100644 --- a/exercises/082_anonymous_structs3.zig +++ b/exercises/082_anonymous_structs3.zig @@ -4,8 +4,8 @@ // // .{ // false, -// @as(u32, 15); -// @as(i64, 67.12); +// @as(u32, 15), +// @as(f64, 67.12) // } // // We call these "tuples", which is a term used by many @@ -96,7 +96,7 @@ fn printTuple(tuple: anytype) void { // // pub const StructField = struct { // name: []const u8, - // field_type: type, + // type: type, // default_value: anytype, // is_comptime: bool, // alignment: comptime_int, |