1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 18:07:35 +00:00

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
29 changed files with 189 additions and 118 deletions

View file

@ -46,7 +46,9 @@ int main(int argc, char** argv)
}
auto file_contents = file->read_all();
auto json = JsonValue::from_string(file_contents);
auto json_result = JsonValue::from_string(file_contents);
ASSERT(json_result.has_value());
auto json = json_result.value();
if (!json.is_object()) {
fprintf(stderr, "Malformed input\n");

View file

@ -167,11 +167,12 @@ void RemoteProcess::update()
dbg() << "Got data size " << length << " and read that many bytes";
auto json_value = JsonValue::from_string(data);
ASSERT(json_value.is_object());
ASSERT(json_value.has_value());
ASSERT(json_value.value().is_object());
dbg() << "Got JSON response " << json_value.to_string();
dbg() << "Got JSON response " << json_value.value().to_string();
auto& response = json_value.as_object();
auto& response = json_value.value().as_object();
auto response_type = response.get("type").as_string_or({});
if (response_type.is_null())

View file

@ -172,12 +172,13 @@ OwnPtr<Profile> Profile::load_from_perfcore_file(const StringView& path)
}
auto json = JsonValue::from_string(file->read_all());
if (!json.is_object()) {
ASSERT(json.has_value());
if (!json.value().is_object()) {
fprintf(stderr, "Invalid perfcore format (not a JSON object)\n");
return nullptr;
}
auto& object = json.as_object();
auto& object = json.value().as_object();
auto executable_path = object.get("executable").to_string();
MappedFile elf_file(executable_path);

View file

@ -389,14 +389,15 @@ void VBForm::load_from_file(const String& path)
auto file_contents = file->read_all();
auto form_json = JsonValue::from_string(file_contents);
ASSERT(form_json.has_value());
if (!form_json.is_object()) {
if (!form_json.value().is_object()) {
GUI::MessageBox::show(String::format("Could not parse '%s'", path.characters()), "Error", GUI::MessageBox::Type::Error, GUI::MessageBox::InputType::OK, window());
return;
}
m_name = form_json.as_object().get("name").to_string();
auto widgets = form_json.as_object().get("widgets").as_array();
m_name = form_json.value().as_object().get("name").to_string();
auto widgets = form_json.value().as_object().get("widgets").as_array();
widgets.for_each([&](const JsonValue& widget_value) {
auto& widget_object = widget_value.as_object();