mirror of
https://github.com/RGBCube/serenity
synced 2025-07-23 20:17:42 +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:
parent
39576b2238
commit
e8e728454c
29 changed files with 189 additions and 118 deletions
|
@ -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();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue