generic-library/jsoncpp
1
0
Fork 0
mirror of https://github.com/open-source-parsers/jsoncpp.git synced 2025-04-03 01:54:44 +02:00
Code Issues Projects Releases Wiki Activity

Allow trailing comma in arrays if dropped null placeholders are not allowed

Browse Source
This commit is contained in:
Jacob Bundgaard 2019-10-17 16:03:31 +02:00 committed by Christopher Dunn
parent 01db7b7430
commit 554d961625
4 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/lib_json/json_reader.cpp
View File

@ -503,15 +503,16 @@ bool Reader::readArray(Token& token) {
Value init(arrayValue); Value init(arrayValue);
currentValue().swapPayload(init); currentValue().swapPayload(init);
currentValue().setOffsetStart(token.start_ - begin_); currentValue().setOffsetStart(token.start_ - begin_);
skipSpaces();
if (current_ != end_ && *current_ == ']') // empty array
{
Token endArray;
readToken(endArray);
return true;
}
int index = 0; int index = 0;
for (;;) { for (;;) {
skipSpaces();
if (current_ != end_ && *current_ == ']' && (index == 0 || (features_.allowTrailingCommas_ && !features_.allowDroppedNullPlaceholders_))) // empty array or trailing comma
{
Token endArray;
readToken(endArray);
return true;
}
Value& value = currentValue()[index++]; Value& value = currentValue()[index++];
nodes_.push(&value); nodes_.push(&value);
bool ok = readValue(); bool ok = readValue();
@ -1493,15 +1494,15 @@ bool OurReader::readArray(Token& token) {
Value init(arrayValue); Value init(arrayValue);
currentValue().swapPayload(init); currentValue().swapPayload(init);
currentValue().setOffsetStart(token.start_ - begin_); currentValue().setOffsetStart(token.start_ - begin_);
skipSpaces();
if (current_ != end_ && *current_ == ']') // empty array
{
Token endArray;
readToken(endArray);
return true;
}
int index = 0; int index = 0;
for (;;) { for (;;) {
skipSpaces();
if (current_ != end_ && *current_ == ']' && (index == 0 || (features_.allowTrailingCommas_ && !features_.allowDroppedNullPlaceholders_))) // empty array or trailing comma
{
Token endArray;
readToken(endArray);
return true;
}
Value& value = currentValue()[index++]; Value& value = currentValue()[index++];
nodes_.push(&value); nodes_.push(&value);
bool ok = readValue(); bool ok = readValue();

1
test/data/fail_test_array_02.json Normal file
View File

@ -0,0 +1 @@
[1,,]

2
test/data/test_array_08.expected Normal file
View File

@ -0,0 +1,2 @@
.=[]
.[0]=1

1
test/data/test_array_08.json Normal file
View File

@ -0,0 +1 @@
[1,]