diff options
| author | daurnimator <quae@daurnimator.com> | 2021-01-31 23:39:15 +1100 |
|---|---|---|
| committer | daurnimator <quae@daurnimator.com> | 2021-01-31 23:41:32 +1100 |
| commit | 33c0a01b08262d5ad0c666d8fbeb35dfcb36b5ef (patch) | |
| tree | 53d0bc43faf7e604c24b276ab1c8bbcbd475c6ce /lib/std | |
| parent | fdc875ed0080cd2542a854a8cd6c627b25e9b7a4 (diff) | |
| download | zig-33c0a01b08262d5ad0c666d8fbeb35dfcb36b5ef.tar.gz zig-33c0a01b08262d5ad0c666d8fbeb35dfcb36b5ef.zip | |
std.json support for comptime fields
Closes #6231
Diffstat (limited to 'lib/std')
| -rw-r--r-- | lib/std/json.zig | 29 |
1 files changed, 26 insertions, 3 deletions
diff --git a/lib/std/json.zig b/lib/std/json.zig index dc23155a5e..1fdd7ce9d6 100644 --- a/lib/std/json.zig +++ b/lib/std/json.zig @@ -1471,7 +1471,7 @@ fn parseInternal(comptime T: type, token: Token, tokens: *TokenStream, options: var fields_seen = [_]bool{false} ** structInfo.fields.len; errdefer { inline for (structInfo.fields) |field, i| { - if (fields_seen[i]) { + if (fields_seen[i] and !field.is_comptime) { parseFree(field.field_type, @field(r, field.name), options); } } @@ -1504,7 +1504,15 @@ fn parseInternal(comptime T: type, token: Token, tokens: *TokenStream, options: parseFree(field.field_type, @field(r, field.name), options); } } - @field(r, field.name) = try parse(field.field_type, tokens, options); + if (field.is_comptime) { + const value = try parse(field.field_type, tokens, options); + defer parseFree(field.field_type, value, options); + if (value != @field(r, field.name)) { + return error.UnexpectedValue; + } + } else { + @field(r, field.name) = try parse(field.field_type, tokens, options); + } fields_seen[i] = true; found = true; break; @@ -1518,7 +1526,9 @@ fn parseInternal(comptime T: type, token: Token, tokens: *TokenStream, options: inline for (structInfo.fields) |field, i| { if (!fields_seen[i]) { if (field.default_value) |default| { - @field(r, field.name) = default; + if (!field.is_comptime) { + @field(r, field.name) = default; + } } else { return error.MissingField; } @@ -1789,6 +1799,19 @@ test "parseFree descends into tagged union" { testing.expectEqual(@as(usize, 1), fail_alloc.deallocations); } +test "parse with comptime field" { + const T = struct { + comptime a: i32 = 0, + b: bool, + }; + testing.expectEqual(T{ .a = 0, .b = true }, try parse(T, &TokenStream.init( + \\{ + \\ "a": 0, + \\ "b": true + \\} + ), ParseOptions{})); +} + test "parse into struct with no fields" { const T = struct {}; testing.expectEqual(T{}, try parse(T, &TokenStream.init("{}"), ParseOptions{})); |