commit 039cedaf8e2884d136b70aae1f3a2b80640b2583
author Niels <niels.lohmann@gmail.com> Wed Aug 17 23:14:28 2016 +0200
committer Niels <niels.lohmann@gmail.com> Wed Aug 17 23:14:28 2016 +0200
tree 19a516b85bfc1e41fb8a73a82a16f05d7654c110
parent 628a5eae500b8320aec3f0fbb4a5eba48d320e03

changes to address #295

src/json.hpp

diff --git a/src/json.hpp b/src/json.hpp
index ddf37eb..a8289a4 100644
--- a/src/json.hpp
+++ b/src/json.hpp
@@ -8892,7 +8892,8 @@
             {
                 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 {}
                         result.m_type = value_t::object;
@@ -8970,7 +8971,8 @@
 
                 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 []
                         result.m_type = value_t::array;

src/json.hpp.re2c

diff --git a/src/json.hpp.re2c b/src/json.hpp.re2c
index 740c768..ffa20f3 100644
--- a/src/json.hpp.re2c
+++ b/src/json.hpp.re2c
@@ -8189,7 +8189,8 @@
             {
                 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 {}
                         result.m_type = value_t::object;
@@ -8267,7 +8268,8 @@
 
                 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 []
                         result.m_type = value_t::array;