generic-library/jsoncpp
1
0
Fork 0
mirror of https://github.com/open-source-parsers/jsoncpp.git synced 2024-12-13 18:27:10 +01:00
Code Issues Projects Releases Wiki Activity

[1587188]Fixed parsing of comment at tail of object.

Browse Source
This commit is contained in:
Christopher Dunn 2007-03-23 05:04:38 +00:00
parent 3ffbf208a0
commit fe536c0631
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/lib_json/json_reader.cpp
View File

@ -395,12 +395,17 @@ Reader::readObject( Token &tokenStart )
Token comma; Token comma;
if ( !readToken( comma ) if ( !readToken( comma )
|| ( comma.type_ != tokenObjectEnd && || ( comma.type_ != tokenObjectEnd &&
comma.type_ != tokenArraySeparator ) ) comma.type_ != tokenArraySeparator &&
comma.type_ != tokenComment ) )
{ {
return addErrorAndRecover( "Missing ',' or '}' in object declaration", return addErrorAndRecover( "Missing ',' or '}' in object declaration",
comma, comma,
tokenObjectEnd ); tokenObjectEnd );
} }
bool finalizeTokenOk = true;
while ( comma.type_ == tokenComment &&
finalizeTokenOk )
finalizeTokenOk = readToken( comma );
if ( comma.type_ == tokenObjectEnd ) if ( comma.type_ == tokenObjectEnd )
return true; return true;
} }