AK: JsonParser improvements

- 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
Notes: sideshowbarker 2024-07-19 05:40:46 +09:00
29 changed files with 189 additions and 118 deletions

View file

@ -56,7 +56,8 @@ int main(int argc, char** argv)
return 1;
auto json = JsonValue::from_string(file->read_all());
ASSERT(json.is_object());
ASSERT(json.has_value());
ASSERT(json.value().is_object());
out() << "#include <AK/Assertions.h>";
out() << "#include <LibWeb/CSS/PropertyID.h>";
@ -65,7 +66,7 @@ int main(int argc, char** argv)
out() << "PropertyID property_id_from_string(const StringView& string) {";
json.as_object().for_each_member([&](auto& name, auto& value) {
json.value().as_object().for_each_member([&](auto& name, auto& value) {
ASSERT(value.is_object());
out() << " if (string.equals_ignoring_case(\"" << name << "\"))";
out() << " return PropertyID::" << title_casify(name) << ";";
@ -77,7 +78,7 @@ int main(int argc, char** argv)
out() << "const char* string_from_property_id(PropertyID property_id) {";
out() << " switch (property_id) {";
json.as_object().for_each_member([&](auto& name, auto& value) {
json.value().as_object().for_each_member([&](auto& name, auto& value) {
ASSERT(value.is_object());
out() << " case PropertyID::" << title_casify(name) << ":";
out() << " return \"" << name << "\";";