mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-02-18 07:18:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix duplicate_field_behavior UseFirst in json.zig

Browse Source
This commit is contained in:
Matthew Borkowski 2021-05-13 09:43:55 -04:00
parent e902c19c0e
commit cadb84b3ac
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/std/json.zig
View File

@ -1573,7 +1573,7 @@ fn parseInternal(comptime T: type, token: Token, tokens: *TokenStream, options:
// .UseLast => {},
// }
if (options.duplicate_field_behavior == .UseFirst) {
break;
// do nothing, check of fields_seen[i] below will parse value without overwriting field
} else if (options.duplicate_field_behavior == .Error) {
return error.DuplicateJSONField;
} else if (options.duplicate_field_behavior == .UseLast) {
@ -1586,7 +1586,11 @@ fn parseInternal(comptime T: type, token: Token, tokens: *TokenStream, options:
return error.UnexpectedValue;
}
} else {
@field(r, field.name) = try parse(field.field_type, tokens, options);
if (fields_seen[i]) {
parseFree(field.field_type, try parse(field.field_type, tokens, options), options);
} else {
@field(r, field.name) = try parse(field.field_type, tokens, options);
}
}
fields_seen[i] = true;
found = true;
@ -2013,6 +2017,9 @@ test "parse into struct with duplicate field" {
const T2 = struct { a: f64 };
try testing.expectEqual(T2{ .a = 0.25 }, try parse(T2, &TokenStream.init(str), options));
try testing.expectEqual(T2{ .a = 1.0 }, try parse(T2, &TokenStream.init(str),
.{ .duplicate_field_behavior = .UseFirst }
));
}
/// A non-stream JSON parser which constructs a tree of Value's.