Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
J
json
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Chen Yisong
json
Commits
039cedaf
Commit
039cedaf
authored
Aug 17, 2016
by
Niels
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
changes to address #295
parent
628a5eae
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
4 deletions
+8
-4
json.hpp
src/json.hpp
+4
-2
json.hpp.re2c
src/json.hpp.re2c
+4
-2
No files found.
src/json.hpp
View file @
039cedaf
...
@@ -8892,7 +8892,8 @@ basic_json_parser_63:
...
@@ -8892,7 +8892,8 @@ basic_json_parser_63:
{
{
case
lexer
:
:
token_type
::
begin_object
:
case
lexer
:
:
token_type
::
begin_object
:
{
{
if
(
keep
and
(
not
callback
or
(
keep
=
callback
(
depth
++
,
parse_event_t
::
object_start
,
result
))))
if
(
keep
and
(
not
callback
or
((
keep
=
callback
(
depth
++
,
parse_event_t
::
object_start
,
result
))
!=
0
)))
{
{
// explicitly set result to object to cope with {}
// explicitly set result to object to cope with {}
result
.
m_type
=
value_t
::
object
;
result
.
m_type
=
value_t
::
object
;
...
@@ -8970,7 +8971,8 @@ basic_json_parser_63:
...
@@ -8970,7 +8971,8 @@ basic_json_parser_63:
case
lexer
:
:
token_type
::
begin_array
:
case
lexer
:
:
token_type
::
begin_array
:
{
{
if
(
keep
and
(
not
callback
or
(
keep
=
callback
(
depth
++
,
parse_event_t
::
array_start
,
result
))))
if
(
keep
and
(
not
callback
or
((
keep
=
callback
(
depth
++
,
parse_event_t
::
array_start
,
result
))
!=
0
)))
{
{
// explicitly set result to object to cope with []
// explicitly set result to object to cope with []
result
.
m_type
=
value_t
::
array
;
result
.
m_type
=
value_t
::
array
;
...
...
src/json.hpp.re2c
View file @
039cedaf
...
@@ -8189,7 +8189,8 @@ class basic_json
...
@@ -8189,7 +8189,8 @@ class basic_json
{
{
case lexer::token_type::begin_object:
case lexer::token_type::begin_object:
{
{
if (keep and (not callback or (keep = callback(depth++, parse_event_t::object_start, result))))
if (keep and (not callback
or ((keep = callback(depth++, parse_event_t::object_start, result)) != 0)))
{
{
// explicitly set result to object to cope with {}
// explicitly set result to object to cope with {}
result.m_type = value_t::object;
result.m_type = value_t::object;
...
@@ -8267,7 +8268,8 @@ class basic_json
...
@@ -8267,7 +8268,8 @@ class basic_json
case lexer::token_type::begin_array:
case lexer::token_type::begin_array:
{
{
if (keep and (not callback or (keep = callback(depth++, parse_event_t::array_start, result))))
if (keep and (not callback
or ((keep = callback(depth++, parse_event_t::array_start, result)) != 0)))
{
{
// explicitly set result to object to cope with []
// explicitly set result to object to cope with []
result.m_type = value_t::array;
result.m_type = value_t::array;
...
...
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