mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-06-24 03:02:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

AK: JsonParser improvements

Browse source 
- 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
Notes: sideshowbarker 2024-07-19 05:40:46 +09:00
29 changed files with 189 additions and 118 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Libraries/LibKeyboard/CharacterMapFile.cpp
View file

@ -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");