From 036e76d3a57f22128eeef4d6d5913addbfcd4a30 Mon Sep 17 00:00:00 2001
From: Luna <git@l4.pm>
Date: Sun, 30 Jun 2019 00:01:03 -0300
Subject: [PATCH] fix for latest zig

---
 src/chunk.zig    | 2 +-
 src/compiler.zig | 4 ++--
 src/main.zig     | 6 ++----
 src/scanner.zig  | 4 ++--
 src/vm.zig       | 2 +-
 5 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/chunk.zig b/src/chunk.zig
index a244bd2..27af808 100644
--- a/src/chunk.zig
+++ b/src/chunk.zig
@@ -170,7 +170,7 @@ pub const Chunk = struct {
             const v2: u8 = @intCast(u8, (idx_u24 >> 8) & mask);
             const v3: u8 = @intCast(u8, (idx_u24 >> 16) & mask);
 
-            return ConstantIndex{ .Long = []u8{ v3, v2, v1 } };
+            return ConstantIndex{ .Long = [_]u8{ v3, v2, v1 } };
         }
     }
 
diff --git a/src/compiler.zig b/src/compiler.zig
index 398741b..12e710b 100644
--- a/src/compiler.zig
+++ b/src/compiler.zig
@@ -48,7 +48,7 @@ const ParseRule = struct {
 };
 
 /// For each token, this defines a parse rule for it.
-var rules = []ParseRule{
+var rules = [_]ParseRule{
     // for LEFT_PAREN, we determine it as a call precedence
     // plus a prefix parse function of grouping
     ParseRule{ .prefix = Compiler.grouping, .precedence = .Call },
@@ -150,7 +150,7 @@ pub const Compiler = struct {
             .vmach = vmach,
 
             // local variable resolution
-            .locals = []Local{Local{
+            .locals = [_]Local{Local{
                 .name = Token{},
                 .depth = -1,
             }} ** 256,
diff --git a/src/main.zig b/src/main.zig
index 1162392..4189e97 100644
--- a/src/main.zig
+++ b/src/main.zig
@@ -94,8 +94,7 @@ fn runPrompt(allocator: *Allocator) !void {
 }
 
 pub fn main() anyerror!void {
-    var da = std.heap.DirectAllocator.init();
-    var arena = std.heap.ArenaAllocator.init(&da.allocator);
+    var arena = std.heap.ArenaAllocator.init(std.heap.direct_allocator);
     defer arena.deinit();
     var allocator = &arena.allocator;
 
@@ -115,8 +114,7 @@ pub fn main() anyerror!void {
 }
 
 pub fn oldMain() !void {
-    var da = std.heap.DirectAllocator.init();
-    var arena = std.heap.ArenaAllocator.init(&da.allocator);
+    var arena = std.heap.ArenaAllocator.init(std.heap.direct_allocator);
     defer arena.deinit();
     var allocator = &arena.allocator;
 
diff --git a/src/scanner.zig b/src/scanner.zig
index 93f8160..1d8d831 100644
--- a/src/scanner.zig
+++ b/src/scanner.zig
@@ -32,7 +32,7 @@ pub const KeywordMap = std.AutoHashMap([]const u8, u6);
 fn initKeywordMap(allocator: *std.mem.Allocator) !KeywordMap {
     var map = KeywordMap.init(allocator);
 
-    const keywords = [][]const u8{
+    const keywords = [_][]const u8{
         "and"[0..],
         "class"[0..],
         "else"[0..],
@@ -51,7 +51,7 @@ fn initKeywordMap(allocator: *std.mem.Allocator) !KeywordMap {
         "while"[0..],
     };
 
-    const tags = []TokenType{
+    const tags = [_]TokenType{
         TokenType.AND,
         TokenType.CLASS,
         TokenType.ELSE,
diff --git a/src/vm.zig b/src/vm.zig
index b3e3942..1a03f39 100644
--- a/src/vm.zig
+++ b/src/vm.zig
@@ -166,7 +166,7 @@ pub const VM = struct {
         var res_str = try std.mem.join(
             self.allocator,
             "",
-            [][]u8{ a, b },
+            [_][]u8{ a, b },
         );
 
         var val = values.ObjVal(try objects.takeString(self, res_str));