diff options
author | Matthew Olsson <matthewcolsson@gmail.com> | 2020-06-10 21:40:27 -0700 |
---|---|---|
committer | Andreas Kling <kling@serenityos.org> | 2020-06-13 12:43:22 +0200 |
commit | e8e728454c5d436a02eaa1d24bc3afe357090c52 (patch) | |
tree | ac40614d78823eaba887e5657132681761c2b7cc /DevTools/VisualBuilder/VBForm.cpp | |
parent | 39576b22385a2e6b6fc4fbf5e90e6b72157e9ee2 (diff) | |
download | serenity-e8e728454c5d436a02eaa1d24bc3afe357090c52.zip |
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
Diffstat (limited to 'DevTools/VisualBuilder/VBForm.cpp')
-rw-r--r-- | DevTools/VisualBuilder/VBForm.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/DevTools/VisualBuilder/VBForm.cpp b/DevTools/VisualBuilder/VBForm.cpp index 7bd247c188..6f813a4e55 100644 --- a/DevTools/VisualBuilder/VBForm.cpp +++ b/DevTools/VisualBuilder/VBForm.cpp @@ -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(); |