mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-01-20 22:35:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

std.json.parseInternal: use switches instead of ifs

Browse Source
This commit is contained in:
r00ster91 2023-03-08 19:25:53 +01:00
parent ecc0108cea
commit 7e3591bedd
1 changed files with 18 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
lib/std/json.zig
View File

@ -1534,30 +1534,25 @@ fn parseInternal(
child_options.allow_trailing_data = true;
var found = false;
inline for (structInfo.fields, 0..) |field, i| {
// TODO: using switches here segfault the compiler (#2727?)
if ((stringToken.escapes == .None and mem.eql(u8, field.name, key_source_slice)) or (stringToken.escapes == .Some and (field.name.len == stringToken.decodedLength() and encodesTo(field.name, key_source_slice)))) {
// if (switch (stringToken.escapes) {
// .None => mem.eql(u8, field.name, key_source_slice),
// .Some => (field.name.len == stringToken.decodedLength() and encodesTo(field.name, key_source_slice)),
// }) {
if (switch (stringToken.escapes) {
.None => mem.eql(u8, field.name, key_source_slice),
.Some => (field.name.len == stringToken.decodedLength() and encodesTo(field.name, key_source_slice)),
}) {
if (fields_seen[i]) {
// switch (options.duplicate_field_behavior) {
// .UseFirst => {},
// .Error => {},
// .UseLast => {},
// }
if (options.duplicate_field_behavior == .UseFirst) {
// unconditonally ignore value. for comptime fields, this skips check against default_value
parseFree(field.type, try parse(field.type, tokens, child_options), child_options);
found = true;
break;
} else if (options.duplicate_field_behavior == .Error) {
return error.DuplicateJSONField;
} else if (options.duplicate_field_behavior == .UseLast) {
if (!field.is_comptime) {
parseFree(field.type, @field(r, field.name), child_options);
}
fields_seen[i] = false;
switch (options.duplicate_field_behavior) {
.UseFirst => {
// unconditonally ignore value. for comptime fields, this skips check against default_value
parseFree(field.type, try parse(field.type, tokens, child_options), child_options);
found = true;
break;
},
.Error => return error.DuplicateJSONField,
.UseLast => {
if (!field.is_comptime) {
parseFree(field.type, @field(r, field.name), child_options);
}
fields_seen[i] = false;
},
}
}
if (field.is_comptime) {