j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

🔨 overworked accept() function

Browse source 
Fixed to make sure no token is "overlooked".
This commit is contained in:
Niels Lohmann 2017-05-20 12:24:13 +02:00
parent 9ddc69f3a9
commit 8a35fdd8f5
No known key found for this signature in database
GPG key ID: 7F3CEA63AE251B69
1 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/json.hpp
View file

@ -12556,7 +12556,7 @@ scan_number_done:
return false; return false;
} }
if (strict and last_token != lexer::token_type::end_of_input) if (strict and get_token() != lexer::token_type::end_of_input)
{ {
return false; return false;
} }
@ -12787,6 +12787,14 @@ scan_number_done:
/*! /*!
@brief the acutal acceptor @brief the acutal acceptor
@invariant 1. The last token is not yet processed. Therefore, the
caller of this function must make sure a token has
been read.
2. When this function returns, the last token is processed.
That is, the last read character was already considered.
This invariant makes sure that no token needs to be "unput".
*/ */
bool accept_internal() bool accept_internal()
{ {
@ -12800,7 +12808,6 @@ scan_number_done:
// closing } -> we are done // closing } -> we are done
if (last_token == lexer::token_type::end_object) if (last_token == lexer::token_type::end_object)
{ {
get_token();
return true; return true;
} }
@ -12828,6 +12835,7 @@ scan_number_done:
} }
// comma -> next value // comma -> next value
get_token();
if (last_token == lexer::token_type::value_separator) if (last_token == lexer::token_type::value_separator)
{ {
get_token(); get_token();
@ -12840,7 +12848,6 @@ scan_number_done:
return false; return false;
} }
get_token();
return true; return true;
} }
} }
@ -12853,7 +12860,6 @@ scan_number_done:
// closing ] -> we are done // closing ] -> we are done
if (last_token == lexer::token_type::end_array) if (last_token == lexer::token_type::end_array)
{ {
get_token();
return true; return true;
} }
@ -12867,6 +12873,7 @@ scan_number_done:
} }
// comma -> next value // comma -> next value
get_token();
if (last_token == lexer::token_type::value_separator) if (last_token == lexer::token_type::value_separator)
{ {
get_token(); get_token();
@ -12879,20 +12886,18 @@ scan_number_done:
return false; return false;
} }
get_token();
return true; return true;
} }
} }
case lexer::token_type::literal_null:
case lexer::token_type::value_string:
case lexer::token_type::literal_true:
case lexer::token_type::literal_false: case lexer::token_type::literal_false:
case lexer::token_type::value_unsigned: case lexer::token_type::literal_null:
case lexer::token_type::value_integer: case lexer::token_type::literal_true:
case lexer::token_type::value_float: case lexer::token_type::value_float:
case lexer::token_type::value_integer:
case lexer::token_type::value_string:
case lexer::token_type::value_unsigned:
{ {
get_token();
return true; return true;
} }