summaryrefslogtreecommitdiff
path: root/Userland/jp.cpp
diff options
context:
space:
mode:
authorMatthew Olsson <matthewcolsson@gmail.com>2020-06-10 21:40:27 -0700
committerAndreas Kling <kling@serenityos.org>2020-06-13 12:43:22 +0200
commite8e728454c5d436a02eaa1d24bc3afe357090c52 (patch)
treeac40614d78823eaba887e5657132681761c2b7cc /Userland/jp.cpp
parent39576b22385a2e6b6fc4fbf5e90e6b72157e9ee2 (diff)
downloadserenity-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 'Userland/jp.cpp')
-rw-r--r--Userland/jp.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/Userland/jp.cpp b/Userland/jp.cpp
index 75f8df2ab5..436eb97d2b 100644
--- a/Userland/jp.cpp
+++ b/Userland/jp.cpp
@@ -63,8 +63,9 @@ int main(int argc, char** argv)
auto file_contents = file->read_all();
auto json = JsonValue::from_string(file_contents);
+ ASSERT(json.has_value());
- print(json);
+ print(json.value());
printf("\n");
return 0;
@@ -101,7 +102,7 @@ void print(const JsonValue& value, int indent)
printf("\033[35;1m");
else if (value.is_bool())
printf("\033[32;1m");
- else if (value.is_null() || value.is_undefined())
+ else if (value.is_null())
printf("\033[34;1m");
if (value.is_string())
putchar('"');