RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 16:57:46 +00:00
Code Issues Activity Actions

AK: Make JSON parser return ErrorOr<JsonValue> (instead of Optional)

Browse source 
Also add slightly richer parse errors now that we can include a string
literal with returned errors.

This will allow us to use TRY() when working with JSON data.
This commit is contained in:
Andreas Kling 2021-11-15 01:46:51 +01:00
parent 304c03f457
commit 587f9af960
54 changed files with 172 additions and 228 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Userland/Libraries/LibCore/EventLoop.cpp
View file

@ -144,7 +144,7 @@ private:
auto request = m_socket->read(length);
auto request_json = JsonValue::from_string(request);
if (!request_json.has_value() || !request_json.value().is_object()) {
if (request_json.is_error() || !request_json.value().is_object()) {
dbgln("RPC client sent invalid request");
shutdown();
return;

2
Userland/Libraries/LibCore/ProcessStatisticsReader.cpp
View file

@ -35,7 +35,7 @@ Optional<AllProcessesStatistics> ProcessStatisticsReader::get_all(RefPtr<Core::F
auto file_contents = proc_all_file->read_all();
auto json = JsonValue::from_string(file_contents);
if (!json.has_value())
if (json.is_error())
return {};
auto& json_obj = json.value().as_object();