Ekdohibs/zig
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'Fix-pushToParent-to-work-for-arrays-of-Objects' of https://github.com/winksaville/zig into winksaville-Fix-pushToParent-to-work-for-arrays-of-Objects

Browse Source
This commit is contained in:
Andrew Kelley 2018-11-27 00:45:46 -05:00
commit 7818550edc
No known key found for this signature in database
GPG Key ID: 7C5F548F728501A9
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
std/json.zig
View File

@ -1323,7 +1323,8 @@ pub const Parser = struct {
p.state = State.ObjectKey;
},
// Array Parent -> [ ..., <array>, 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"));
}