RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 20:17:44 +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

4
Userland/Libraries/LibSymbolication/Symbolication.cpp
View file

@ -158,7 +158,7 @@ Vector<Symbol> symbolicate_thread(pid_t pid, pid_t tid, IncludeSourcePosition in
}
auto json = JsonValue::from_string(file_or_error.value()->read_all());
if (!json.has_value() || !json.value().is_array()) {
if (json.is_error() || !json.value().is_array()) {
warnln("Invalid contents in {}", stack_path);
return {};
}
@ -178,7 +178,7 @@ Vector<Symbol> symbolicate_thread(pid_t pid, pid_t tid, IncludeSourcePosition in
}
auto json = JsonValue::from_string(file_or_error.value()->read_all());
if (!json.has_value() || !json.value().is_array()) {
if (json.is_error() || !json.value().is_array()) {
warnln("Invalid contents in {}", vm_path);
return {};
}