From 8d54cbb834ab606ecfe23c6514cbac699319f60c Mon Sep 17 00:00:00 2001 From: Wink Saville Date: Sun, 18 Nov 2018 10:14:37 -0800 Subject: [PATCH] Fix pushToParent to work for arrays of Objects The reference `*array` is a copy of the value on the stack. Instead use a reference to top of stack. This is the same technique used above for `var object` in `Value.String`. Added two simple tests. --- std/json.zig | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/std/json.zig b/std/json.zig index 23573b6d7..9eb3a0ea7 100644 --- a/std/json.zig +++ b/std/json.zig @@ -1323,7 +1323,8 @@ pub const Parser = struct { p.state = State.ObjectKey; }, // Array Parent -> [ ..., , value ] - Value.Array => |*array| { + Value.Array => { + var array = &p.stack.items[p.stack.len - 1].Array; try array.append(value); p.state = State.ArrayValue; }, @@ -1364,7 +1365,8 @@ test "json parser dynamic" { \\ "Width": 100 \\ }, \\ "Animated" : false, - \\ "IDs": [116, 943, 234, 38793] + \\ "IDs": [116, 943, 234, 38793], + \\ "ArrayOfObject": [{"n": "m"}] \\ } \\} ; @@ -1387,4 +1389,10 @@ test "json parser dynamic" { const animated = image.Object.get("Animated").?.value; debug.assert(animated.Bool == false); + + const array_of_object = image.Object.get("ArrayOfObject").?.value; + debug.assert(array_of_object.Array.len == 1); + + const obj0 = array_of_object.Array.at(0).Object.get("n").?.value; + debug.assert(mem.eql(u8, obj0.String, "m")); }