Major Zig cleanup

Author: rtoal

zig/README.md

@@ -2,7 +2,7 @@
 
 # Zig Explorations
 
-To build and run Zig programs on your local machine, download and install Zig from the [Zig Download](https://ziglang.org/download/) or use your favorite package manager, e.g. `brew install zig` on macOS.
+To build and run Zig programs on your local machine, download and install Zig from the [Zig Download](https://ziglang.org/download/) page or use your favorite package manager, e.g. `brew install zig` on macOS.
 
 Once installed, programs in this folder can be run from the command line like so:
 
@@ -18,6 +18,8 @@ zig run permutations.zig -- I like carrots
 zig run top_ten_scorers.zig < ../test/wnba_input
 ```
 
+Test scripts are provided in this folder for both Bash and PowerShell.
+
 ## About Zig
 
 The Zig language was created by Andrew Kelley in 2016, as a pragmatic alternative to the venerable <a href="https://github.com/rtoal/ple/tree/main/c">C</a> programming language. Zig offers many safety features and a growing ecosystem for building and testing. It is known for having “no surprises”: there are no hidden function calls and no hidden memory allocations. Unlike C, Zig has no preprocessor and no macros. Zig does add option types, generics, and custom allocators.
@@ -28,8 +30,8 @@ Continue your exploration of Zig via:
 
 - [Zig Home Page](https://ziglang.org)
 - [Zig Docs](https://ziglang.org/documentation/master/)
-- [Intro to Zig](https://www.youtube.com/watch?v=YXrb-DqsBNU)
-- [ZigLearn](https://ziglearn.org/learn/)
+- Andrew Kelley’s [Intro to Zig](https://www.youtube.com/watch?v=YXrb-DqsBNU) video from GOTO 2022
+- [ZigLearn](https://ziglang.org/learn/)
 - [Wikipedia](<https://en.wikipedia.org/wiki/Zig_(programming_language)>)
 - The book [Introduction to Zig](https://github.com/pedropark99/zig-book)
 

zig/clockhands.zig

@@ -1,11 +1,11 @@
-const print = @import("std").debug.print;
+const stdout = @import("std").io.getStdOut().writer();
 
-pub fn main() void {
+pub fn main() !void {
     for (0..11) |i| {
         const t = (43200 * i + 21600) / 11;
         const h = t / 3600;
         const m = t / 60 % 60;
         const s = t % 60;
-        print("{d:0>2}:{d:0>2}:{d:0>2}\n", .{ if (h == 0) 12 else h, m, s });
+        try stdout.print("{d:0>2}:{d:0>2}:{d:0>2}\n", .{ if (h == 0) 12 else h, m, s });
     }
 }

zig/coords.zig

@@ -1,10 +1,12 @@
 const std = @import("std");
-const print = std.debug.print;
+const stdout = std.io.getStdOut().writer();
 
-fn coord(x: i32, y: i32, z: i32) void {
-    print("The coordinates are: x = {}, y = {}, z = {}\n", .{ x, y, z });
+fn showCoordinates(x: i32, y: i32, z: i32) void {
+    stdout.print("Got: x = {}, y = {}, z = {}\n", .{ x, y, z }) catch {
+        std.debug.panic("{s}\n", .{"Failed to print"});
+    };
 }
 
 pub fn main() void {
-    coord(20, 40, 0);
+    showCoordinates(5, 8, 3);
 }

zig/hello.zig

@@ -1,5 +1,5 @@
-const print = @import("std").debug.print;
+var stdout = @import("std").io.getStdOut().writer();
 
-pub fn main() void {
-    print("Hello, world!\n", .{});
+pub fn main() !void {
+    try stdout.print("{s}\n", .{"Hello, world!"});
 }

zig/odd_even.zig

@@ -1,12 +1,11 @@
-const std = @import("std");
-const print = std.debug.print;
+var stdout = @import("std").io.getStdOut().writer();
 
-pub fn main() void {
+pub fn main() !void {
     const number: i32 = 21;
 
     if (number % 2 == 0) {
-        print("The number {} is even\n", .{number});
+        try stdout.print("The number {} is even\n", .{number});
     } else {
-        print("The number {} is odd\n", .{number});
+        try stdout.print("The number {} is odd\n", .{number});
     }
 }

zig/permuations.zig renamed to zig/permutations.zig

@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+zig run clockhands.zig && \
+zig run coords.zig && \
+zig run hello.zig && \
+zig run odd_even.zig && \
+zig run permutations.zig -- I like carrots | diff ../test/carrots_expected - && \
+zig run top_ten_scorers.zig < ../test/wnba_input | diff ../test/wnba_expected - && \
+zig run triple.zig | diff ../test/triple_expected - && \
+
+if [ $? -ne 0 ]; then
+    echo
+    echo "*** ZIG TESTS FAILED ***"
+    exit 1
+else
+    echo
+    echo "ZIG TESTS PASSED"
+fi

zig/test.sh

@@ -1,4 +1,7 @@
 const std = @import("std");
+const reader = std.io.getStdIn().reader();
+const stdout = std.io.getStdOut().writer();
+const allocator = std.heap.page_allocator;
 
 const Player = struct {
     name: []const u8,
@@ -7,10 +10,6 @@ const Player = struct {
 };
 
 pub fn main() !void {
-    const allocator = std.heap.page_allocator;
-    const reader = std.io.getStdIn().reader();
-    var stdout = std.io.getStdOut().writer();
-
     var players = std.ArrayList(Player).init(allocator);
 
     var buf: [1000]u8 = undefined;

zig/top_ten_scorers.zig

@@ -1,16 +1,12 @@
-const std = @import("std");
-const math = @import("std").math;
-const print = std.debug.print;
+const stdout = @import("std").io.getStdOut().writer();
 
-pub fn main() void {
-    const limit: usize = 40;
-    for (1..limit) |a| {
-        for (a..limit) |b| {
-            const c_squared: usize = a * a + b * b;
-            const c: usize = @intCast(math.sqrt(c_squared));
-
-            if (a * a + b * b == c * c and c <= limit) {
-                print("{}, {}, {}\n", .{ a, b, c });
+pub fn main() !void {
+    for (1..41) |c| {
+        for (1..c) |b| {
+            for (1..b) |a| {
+                if (a * a + b * b == c * c) {
+                    try stdout.print("{}, {}, {}\n", .{ a, b, c });
+                }
             }
         }
     }