Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
J
json
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Libraries
json
Commits
8a35fdd8
Unverified
Commit
8a35fdd8
authored
May 20, 2017
by
Niels Lohmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
🔨
overworked accept() function
Fixed to make sure no token is "overlooked".
parent
9ddc69f3
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
10 deletions
+15
-10
src/json.hpp
src/json.hpp
+15
-10
No files found.
src/json.hpp
View file @
8a35fdd8
...
...
@@ -12556,7 +12556,7 @@ scan_number_done:
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
;
}
...
...
@@ -12787,6 +12787,14 @@ scan_number_done:
/*!
@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
()
{
...
...
@@ -12800,7 +12808,6 @@ scan_number_done:
// closing } -> we are done
if
(
last_token
==
lexer
::
token_type
::
end_object
)
{
get_token
();
return
true
;
}
...
...
@@ -12828,6 +12835,7 @@ scan_number_done:
}
// comma -> next value
get_token
();
if
(
last_token
==
lexer
::
token_type
::
value_separator
)
{
get_token
();
...
...
@@ -12840,7 +12848,6 @@ scan_number_done:
return
false
;
}
get_token
();
return
true
;
}
}
...
...
@@ -12853,7 +12860,6 @@ scan_number_done:
// closing ] -> we are done
if
(
last_token
==
lexer
::
token_type
::
end_array
)
{
get_token
();
return
true
;
}
...
...
@@ -12867,6 +12873,7 @@ scan_number_done:
}
// comma -> next value
get_token
();
if
(
last_token
==
lexer
::
token_type
::
value_separator
)
{
get_token
();
...
...
@@ -12879,20 +12886,18 @@ scan_number_done:
return
false
;
}
get_token
();
return
true
;
}
}
case
lexer
:
:
token_type
::
literal_false
:
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
::
value_unsigned
:
case
lexer
:
:
token_type
::
value_integer
:
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
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment