1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 13:07:46 +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:
Matthew Olsson 2020-06-10 21:40:27 -07:00 committed by Andreas Kling
parent 39576b2238
commit e8e728454c
29 changed files with 189 additions and 118 deletions

View file

@ -37,7 +37,6 @@ namespace AK {
class JsonValue {
public:
enum class Type {
Undefined,
Null,
Int32,
UnsignedInt32,
@ -52,7 +51,7 @@ public:
Object,
};
static JsonValue from_string(const StringView&);
static Optional<JsonValue> from_string(const StringView&);
explicit JsonValue(Type = Type::Null);
~JsonValue() { clear(); }
@ -188,7 +187,6 @@ public:
}
bool is_null() const { return m_type == Type::Null; }
bool is_undefined() const { return m_type == Type::Undefined; }
bool is_bool() const { return m_type == Type::Bool; }
bool is_string() const { return m_type == Type::String; }
bool is_i32() const { return m_type == Type::Int32; }
@ -246,7 +244,7 @@ private:
void clear();
void copy_from(const JsonValue&);
Type m_type { Type::Undefined };
Type m_type { Type::Null };
union {
StringImpl* as_string { nullptr };