RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 05:27:46 +00:00
Code Issues Activity Actions

AK: JsonParser improvements

Browse source 
- Parsing invalid JSON no longer asserts
    Instead of asserting when coming across malformed JSON,
    JsonParser::parse now returns an Optional<JsonValue>.
- Disallow trailing commas in JSON objects and arrays
- No longer parse 'undefined', as that is a purely JS thing
- No longer allow non-whitespace after anything consumed by the initial
  parse() call. Examples of things that were valid and no longer are:
    - undefineddfz
    - {"foo": 1}abcd
    - [1,2,3]4
- JsonObject.for_each_member now iterates in original insertion order
This commit is contained in:
Matthew Olsson 2020-06-10 21:40:27 -07:00 • committed by Andreas Kling
parent 39576b2238
commit e8e728454c
29 changed files with 189 additions and 118 deletions
Download patch file Download diff file Expand all files Collapse all files

8
AK/Tests/TestJSON.cpp
View file

@ -48,7 +48,7 @@ TEST_CASE(load_form)
fclose(fp);
JsonValue form_json = JsonValue::from_string(builder.to_string());
JsonValue form_json = JsonValue::from_string(builder.to_string()).value();
EXPECT(form_json.is_object());
@ -87,14 +87,14 @@ BENCHMARK_CASE(load_4chan_catalog)
auto json_string = builder.to_string();
for (int i = 0; i < 10; ++i) {
JsonValue form_json = JsonValue::from_string(json_string);
JsonValue form_json = JsonValue::from_string(json_string).value();
EXPECT(form_json.is_array());
}
}
TEST_CASE(json_empty_string)
{
auto json = JsonValue::from_string("\"\"");
auto json = JsonValue::from_string("\"\"").value();
EXPECT_EQ(json.type(), JsonValue::Type::String);
EXPECT_EQ(json.as_string().is_null(), false);
EXPECT_EQ(json.as_string().is_empty(), true);
@ -102,7 +102,7 @@ TEST_CASE(json_empty_string)
TEST_CASE(json_utf8_character)
{
auto json = JsonValue::from_string("\"\xc3\x84\"");
auto json = JsonValue::from_string("\"\xc3\x84\"").value();
EXPECT_EQ(json.type(), JsonValue::Type::String);
EXPECT_EQ(json.as_string().is_null(), false);
EXPECT_EQ(json.as_string().length(), size_t { 2 });