Bump Zig version: 0.8.0 => 0.9.0

sonota88 · Jul 16, 2022 · 71d7066 · 71d7066
1 parent 32ff4df
commit 71d7066
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 22 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -19,7 +19,7 @@ USER ${USER}
 
 WORKDIR /home/${USER}
 
-ARG version="0.8.0"
+ARG version="0.9.0"
 ARG archive_file="zig-linux-x86_64-${version}.tar.xz"
 
 RUN wget -q \

diff --git a/README.md b/README.md
@@ -10,14 +10,14 @@ cd vm2gol-v2-zig
 
 ```sh
 ./docker_run.sh zig version
-  # 0.8.0
+  # 0.9.0
 
 LANG=C wc -l vg{lexer,parser,codegen}.zig lib/{types,utils,json}.zig
   #  189 vglexer.zig
   #  630 vgparser.zig
-  #  556 vgcodegen.zig
+  #  552 vgcodegen.zig
   #  209 lib/types.zig
-  #  269 lib/utils.zig
+  #  244 lib/utils.zig
   #  144 lib/json.zig
-  # 1997 total
+  # 1968 total
 ```
diff --git a/docker_build.sh b/docker_build.sh
@@ -3,4 +3,4 @@
 docker build \
   --build-arg USER=$USER \
   --build-arg GROUP=$(id -gn) \
-  -t vm2gol-v2-zig:2 .
+  -t vm2gol-v2-zig:3 .
diff --git a/docker_run.sh b/docker_run.sh
@@ -2,4 +2,4 @@
 
 docker run --rm -it \
   -v"$(pwd):/home/${USER}/work" \
-  vm2gol-v2-zig:2 "$@"
+  vm2gol-v2-zig:3 "$@"
diff --git a/lib/types.zig b/lib/types.zig
@@ -21,7 +21,7 @@ pub const Node = struct {
     const Self = @This();
 
     pub fn init() *Self {
-        var obj = allocator.create(Self) catch |err| {
+        var obj = allocator.create(Self) catch {
             panic("Failed to allocate", .{});
         };
         obj.int = undefined;
@@ -149,7 +149,7 @@ const Name = struct {
     const Self = @This();
 
     pub fn init() *Self {
-        var obj = allocator.create(Self) catch |err| {
+        var obj = allocator.create(Self) catch {
             panic("Failed to allocate", .{});
         };
         return obj;
@@ -174,7 +174,7 @@ pub const Names = struct {
     const Self = @This();
 
     pub fn init() *Self {
-        var obj = allocator.create(Self) catch |err| {
+        var obj = allocator.create(Self) catch {
             panic("Failed to allocate", .{});
         };
         obj.len = 0;

diff --git a/lib/utils.zig b/lib/utils.zig
@@ -204,9 +204,6 @@ pub fn strEq(s1: []const u8, s2: []const u8) bool {
 
 test "strEq" {
     const assert = std.debug.assert;
-    const testing = std.testing;
-    const expect = testing.expect;
-    const expectEqual = testing.expectEqual;
 
     const str: [5]u8 = [_]u8{ 'f', 'o', 'o', 0, 'x' };
 
@@ -235,7 +232,7 @@ pub fn indexOfNonNumeric(str: []const u8, start_index: usize) usize {
 }
 
 pub fn parseInt(str: []const u8) i32 {
-    return std.fmt.parseInt(i32, str, 10) catch |err| {
+    return std.fmt.parseInt(i32, str, 10) catch {
         panic("Failed to parse ({s})", .{str});
     };
 }

diff --git a/vgcodegen.zig b/vgcodegen.zig
@@ -68,7 +68,7 @@ fn fnArgDisp(names: *Names, name: []const u8) i32 {
     return i + 2;
 }
 
-fn lvarDisp(dest: []u8, names: *Names, name: []const u8) i32 {
+fn lvarDisp(names: *Names, name: []const u8) i32 {
     const i = names.indexOf(name);
     if (i == -1) {
         panic("lvar not found", .{});
@@ -176,17 +176,15 @@ fn genExpr(
     switch (expr.kind) {
         .INT => {
             if (expr.int) |intval| {
-                var buf1: [16]u8 = undefined;
                 puts_fmt("  cp {} reg_a", .{ intval });
             } else {
                 panic("must not happen", .{});
             }
         },
         .STR => {
-            var buf2: [16]u8 = undefined;
             const str = expr.getStr();
             if (0 <= lvar_names.indexOf(str)) {
-                const disp = lvarDisp(buf2[0..], lvar_names, str);
+                const disp = lvarDisp(lvar_names, str);
                 puts_fmt("  cp [bp:{}] reg_a", .{ disp });
             } else if (0 <= fn_arg_names.indexOf(str)) {
                 const disp = fnArgDisp(fn_arg_names, str);
@@ -254,8 +252,7 @@ fn genCallSet(
 
     _genFuncall(fn_arg_names, lvar_names, funcall);
 
-    var buf: [8]u8 = undefined;
-    const disp = lvarDisp(buf[0..], lvar_names, lvar_name);
+    const disp = lvarDisp(lvar_names, lvar_name);
     puts_fmt("  cp reg_a [bp:{}]", .{ disp });
 }
 
@@ -269,10 +266,9 @@ fn _genSet(
 
     switch (dest.kind) {
         .STR => {
-            var buf2: [16]u8 = undefined;
             const str = dest.getStr();
             if (0 <= lvar_names.indexOf(str)) {
-                const disp = lvarDisp(buf2[0..], lvar_names, str);
+                const disp = lvarDisp(lvar_names, str);
                 puts_fmt("  cp reg_a [bp:{}]", .{ disp });
             } else {
                 panic("must not happen", .{});