Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move to RFC7159 (closes #90) #101

Merged
merged 15 commits into from
Aug 11, 2014
Merged

Move to RFC7159 (closes #90) #101

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
8d53689
(Pretty)Writer: drop restriction to object/array roots
pah Aug 11, 2014
edccda0
drop object/array root restriction from recursive parser
pah Aug 11, 2014
c9f2715
Reader: drop object/array root restrction from iterative parser
pah Aug 11, 2014
c0c0c39
jsoncheckertest: skip "fail1.json", as it is now accepted by RapidJSON
pah Aug 11, 2014
e45557e
writertest: add some roundtrip tests for non-compound root values
pah Aug 11, 2014
c256752
readertest: drop object/array root restriction tests
pah Aug 11, 2014
8979359
error/{en,error}.h: drop unused kParseErrorDocumentRootNotObjectOrArr…
pah Aug 11, 2014
4d031d0
readme.md: reference RFC7159 instead of RFC4627
pah Aug 11, 2014
24b7976
tutorial.md: lift restriction to object/array root values
pah Aug 11, 2014
e29a452
readertest.cpp: use top-level Parse functions, instead of internal ones
pah Aug 11, 2014
3755470
BaseReaderHandler: allow overriding of Default() implementation
pah Aug 11, 2014
8341095
readertest.cpp: use CRTP to activate "ADD_FAILURE()" calls in handlers
pah Aug 11, 2014
d84c051
jsoncheckertest: add checks for iterative parser as well
pah Aug 11, 2014
453eda5
tabs to 4 spaces (following 0dbcc1cf)
pah Aug 11, 2014
6863033
readertest.cpp: remove remaining use of private functions
pah Aug 11, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Reader: drop object/array root restrction from iterative parser
  • Loading branch information
@pah
pah committed Aug 11, 2014
commit c9f2715115cdab136fa156d82ac7db4ab07c2c05
29 changes: 23 additions & 6 deletions include/rapidjson/reader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -903,6 +903,9 @@ class GenericReader {
IterativeParsingElementDelimiterState,
IterativeParsingArrayFinishState,

// Single value state
IterativeParsingValueState,

cIterativeParsingStateCount
};

Expand Down Expand Up @@ -961,11 +964,11 @@ class GenericReader {
IterativeParsingErrorState, // Right curly bracket
IterativeParsingErrorState, // Comma
IterativeParsingErrorState, // Colon
IterativeParsingErrorState, // String
IterativeParsingErrorState, // False
IterativeParsingErrorState, // True
IterativeParsingErrorState, // Null
IterativeParsingErrorState // Number
IterativeParsingValueState, // String
IterativeParsingValueState, // False
IterativeParsingValueState, // True
IterativeParsingValueState, // Null
IterativeParsingValueState // Number
},
// Finish(sink state)
{
Expand Down Expand Up @@ -1102,6 +1105,12 @@ class GenericReader {
IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState,
IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState,
IterativeParsingErrorState
},
// Single Value (sink state)
{
IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState,
IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState,
IterativeParsingErrorState
}
}; // End of G

Expand Down Expand Up @@ -1238,6 +1247,14 @@ class GenericReader {
}
}

case IterativeParsingValueState:
// Must be non-compound value. Or it would be ObjectInitial or ArrayInitial state.
ParseValue<parseFlags>(is, handler);
if (HasParseError()) {
return IterativeParsingErrorState;
}
return IterativeParsingFinishState;

default:
RAPIDJSON_ASSERT(false);
return IterativeParsingErrorState;
Expand All @@ -1252,7 +1269,7 @@ class GenericReader {
}

switch (src) {
case IterativeParsingStartState: RAPIDJSON_PARSE_ERROR(is.Peek() == '\0' ? kParseErrorDocumentEmpty : kParseErrorDocumentRootNotObjectOrArray, is.Tell());
case IterativeParsingStartState: RAPIDJSON_PARSE_ERROR(kParseErrorDocumentEmpty, is.Tell());
case IterativeParsingFinishState: RAPIDJSON_PARSE_ERROR(kParseErrorDocumentRootNotSingular, is.Tell());
case IterativeParsingObjectInitialState:
case IterativeParsingMemberDelimiterState: RAPIDJSON_PARSE_ERROR(kParseErrorObjectMissName, is.Tell());
Expand Down