zig

commit a5b79017a32e8ee1c9486b3b3bf2c13fa7db899c (tree)
parent 7818550edcced664344abe1a6a66caea194beccc
Author: Andrew Kelley <andrew@ziglang.org>
Date:   Tue, 27 Nov 2018 00:52:32 -0500

fix regression from d5648d26

thanks Wink Saville for the test case.

Diffstat:
M
std/json.zig
 | 
15
+++++++--------

1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/std/json.zig b/std/json.zig
@@ -1188,7 +1188,7 @@ pub const Parser = struct {
                     }
 
                     var value = p.stack.pop();
-                    try p.pushToParent(value);
+                    try p.pushToParent(&value);
                 },
                 Token.Id.String => {
                     try p.stack.append(try p.parseString(allocator, token, input, i));
@@ -1251,7 +1251,7 @@ pub const Parser = struct {
                         }
 
                         var value = p.stack.pop();
-                        try p.pushToParent(value);
+                        try p.pushToParent(&value);
                     },
                     Token.Id.ObjectBegin => {
                         try p.stack.append(Value{ .Object = ObjectMap.init(allocator) });
@@ -1312,20 +1312,19 @@ pub const Parser = struct {
         }
     }
 
-    fn pushToParent(p: *Parser, value: Value) !void {
-        switch (p.stack.at(p.stack.len - 1)) {
+    fn pushToParent(p: *Parser, value: *const Value) !void {
+        switch (p.stack.toSlice()[p.stack.len - 1]) {
             // Object Parent -> [ ..., object, <key>, value ]
             Value.String => |key| {
                 _ = p.stack.pop();
 
                 var object = &p.stack.items[p.stack.len - 1].Object;
-                _ = try object.put(key, value);
+                _ = try object.put(key, value.*);
                 p.state = State.ObjectKey;
             },
             // Array Parent -> [ ..., <array>, value ]
-            Value.Array => {
-                var array = &p.stack.items[p.stack.len - 1].Array;
-                try array.append(value);
+            Value.Array => |*array| {
+                try array.append(value.*);
                 p.state = State.ArrayValue;
             },
             else => {