Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[#7176] json.h update #7181

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
+86 −16
Open

[#7176] json.h update #7181

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f756843
json.h update :
mtb0x1 Dec 26, 2024
b85075f
refactor
mtb0x1 Dec 30, 2024
a663593
lint and tests
mtb0x1 Dec 30, 2024
800fb82
fix test
mtb0x1 Dec 30, 2024
5e07222
cleanup
mtb0x1 Dec 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 42 additions & 16 deletions src/support/json.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,8 +261,14 @@ struct Value {
if (*curr == '"') {
// String
curr++;
char* close = strchr(curr, '"');
assert(close);
char* close = curr;
while (*close && *close != '"') {
if (*close == '\\' && *(close + 1)) {
close++; // Skip escaped character
}
close++;
}
assert(*close == '"');
*close = 0; // end this string, and reuse it straight from the input
setString(curr);
curr = close + 1;
Expand Down Expand Up @@ -305,20 +311,40 @@ struct Value {
skip();
setObject();
while (*curr != '}') {
assert(*curr == '"');
curr++;
char* close = strchr(curr, '"');
assert(close);
*close = 0; // end this string, and reuse it straight from the input
IString key(curr);
curr = close + 1;
skip();
assert(*curr == ':');
curr++;
skip();
Ref value = Ref(new Value());
curr = value->parse(curr);
(*obj)[key] = value;
if (*curr == '"') {
curr++;
char* close = curr;
while (*close && *close != '"') {
if (*close == '\\' && *(close + 1)) {
close++; // Skip escaped character
}
close++;
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This pattern of skipping escaped characters appears more than once. How about adding a helper function findEndOfQuoted()?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

While doing so, the asserts at the end (next line) could be error checks with Fatal() << "error message" (so they also work in non-debug builds - asserts are debug-only).

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I added 2 helpers using macros : (used macros to stay consistent with the style of this file)

  • pattern of skipping chars
  • runtime assert (to take in account release builds), also I am guessing that we need to change all assert(..) occurrences in parse function at least, since all of them are required ?

Now I have a doubt about the "quoted unquoted" keys in json, while testing I used the file referenced here. the said file have keys unquoted, this is allowed by most of the tools out there (browser included) but this doesn't seem to be allowed by JSON RFC.

I added 2 tests to cover the PR.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure about the JSON spec, but it makes sense for us (as just another tool) to support patterns that are commonly supported by tools, even if the spec isn't clear there.

assert(*close == '"');
*close = 0; // end this string, and reuse it straight from the input
IString key(curr);
curr = close + 1;
skip();
assert(*curr == ':');
curr++;
skip();
Ref value = Ref(new Value());
curr = value->parse(curr);
(*obj)[key] = value;
} else {
// Unquoted key
char* start = curr;
while (*curr && *curr != ':' && !is_json_space(*curr)) {
curr++;
}
assert(*curr == ':');
IString key(std::string(start, curr - start).c_str());
curr++;
skip();
Ref value = Ref(new Value());
curr = value->parse(curr);
(*obj)[key] = value;
}
skip();
if (*curr == '}') {
break;
Expand Down
Loading