mirror of
https://github.com/RGBCube/serenity
synced 2025-07-26 14:57:34 +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
|
@ -105,13 +105,13 @@ public:
|
|||
auto request = m_socket->read(length);
|
||||
|
||||
auto request_json = JsonValue::from_string(request);
|
||||
if (!request_json.is_object()) {
|
||||
if (!request_json.has_value() || !request_json.value().is_object()) {
|
||||
dbg() << "RPC client sent invalid request";
|
||||
shutdown();
|
||||
return;
|
||||
}
|
||||
|
||||
handle_request(request_json.as_object());
|
||||
handle_request(request_json.value().as_object());
|
||||
};
|
||||
}
|
||||
virtual ~RPCClient() override
|
||||
|
|
|
@ -48,7 +48,8 @@ HashMap<pid_t, Core::ProcessStatistics> ProcessStatisticsReader::get_all()
|
|||
|
||||
auto file_contents = file->read_all();
|
||||
auto json = JsonValue::from_string(file_contents);
|
||||
json.as_array().for_each([&](auto& value) {
|
||||
ASSERT(json.has_value());
|
||||
json.value().as_array().for_each([&](auto& value) {
|
||||
const JsonObject& process_object = value.as_object();
|
||||
Core::ProcessStatistics process;
|
||||
|
||||
|
|
|
@ -42,8 +42,9 @@ void JsonArrayModel::update()
|
|||
|
||||
auto json = JsonValue::from_string(file->read_all());
|
||||
|
||||
ASSERT(json.is_array());
|
||||
m_array = json.as_array();
|
||||
ASSERT(json.has_value());
|
||||
ASSERT(json.value().is_array());
|
||||
m_array = json.value().as_array();
|
||||
|
||||
did_update();
|
||||
}
|
||||
|
|
|
@ -48,7 +48,9 @@ Optional<CharacterMapData> CharacterMapFile::load_from_file(const String& file_n
|
|||
}
|
||||
|
||||
auto file_contents = file->read_all();
|
||||
auto json = JsonValue::from_string(file_contents).as_object();
|
||||
auto json_result = JsonValue::from_string(file_contents);
|
||||
ASSERT(json_result.has_value());
|
||||
auto json = json_result.value().as_object();
|
||||
|
||||
ByteBuffer map = read_map(json, "map");
|
||||
ByteBuffer shift_map = read_map(json, "shift_map");
|
||||
|
|
|
@ -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 << "\";";
|
||||
|
|
|
@ -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() << "#pragma once";
|
||||
out() << "#include <AK/StringView.h>";
|
||||
|
@ -67,7 +68,7 @@ int main(int argc, char** argv)
|
|||
out() << "enum class PropertyID {";
|
||||
out() << " Invalid,";
|
||||
|
||||
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() << " " << title_casify(name) << ",";
|
||||
});
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue