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

🔨 some refactoring

Browse source
This commit is contained in:
Niels Lohmann 2018-03-18 16:07:21 +01:00
parent 22929fe189
commit 943d641054
No known key found for this signature in database
GPG key ID: 7F3CEA63AE251B69
3 changed files with 74 additions and 94 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
include/nlohmann/detail/input/json_sax.hpp
View file

@ -278,24 +278,18 @@ class json_sax_dom_parser : public json_sax<BasicJsonType>
} }
else else
{ {
switch (ref_stack.back()->m_type) assert(ref_stack.back()->is_array() or ref_stack.back()->is_object());
if (ref_stack.back()->is_array())
{ {
case value_t::array: ref_stack.back()->m_value.array->emplace_back(std::forward<Value>(v));
{
ref_stack.back()->m_value.array->push_back(BasicJsonType(std::forward<Value>(v)));
return &(ref_stack.back()->m_value.array->back()); return &(ref_stack.back()->m_value.array->back());
} }
else
case value_t::object:
{ {
assert(object_element); assert(object_element);
*object_element = BasicJsonType(std::forward<Value>(v)); *object_element = BasicJsonType(std::forward<Value>(v));
return object_element; return object_element;
} }
default:
assert(false); // LCOV_EXCL_LINE
}
} }
} }
@ -397,6 +391,7 @@ class json_sax_dom_callback_parser : public json_sax<BasicJsonType>
const bool keep = callback(ref_stack.size() - 1, parse_event_t::object_end, *ref_stack.back()); const bool keep = callback(ref_stack.size() - 1, parse_event_t::object_end, *ref_stack.back());
if (not keep) if (not keep)
{ {
// discard object
*ref_stack.back() = discarded; *ref_stack.back() = discarded;
} }
@ -426,6 +421,7 @@ class json_sax_dom_callback_parser : public json_sax<BasicJsonType>
const bool keep = callback(ref_stack.size() - 1, parse_event_t::array_end, *ref_stack.back()); const bool keep = callback(ref_stack.size() - 1, parse_event_t::array_end, *ref_stack.back());
if (not keep) if (not keep)
{ {
// discard array
*ref_stack.back() = discarded; *ref_stack.back() = discarded;
} }
@ -487,24 +483,18 @@ class json_sax_dom_callback_parser : public json_sax<BasicJsonType>
} }
else else
{ {
switch (ref_stack.back()->m_type) assert(ref_stack.back()->is_array() or ref_stack.back()->is_object());
if (ref_stack.back()->is_array())
{ {
case value_t::array: ref_stack.back()->m_value.array->emplace_back(std::forward<Value>(v));
{
ref_stack.back()->m_value.array->push_back(BasicJsonType(std::forward<Value>(v)));
return &(ref_stack.back()->m_value.array->back()); return &(ref_stack.back()->m_value.array->back());
} }
else
case value_t::object:
{ {
assert(object_element); assert(object_element);
*object_element = BasicJsonType(std::forward<Value>(v)); *object_element = BasicJsonType(std::forward<Value>(v));
return object_element; return object_element;
} }
default:
assert(false); // LCOV_EXCL_LINE
}
} }
} }

30
include/nlohmann/detail/input/parser.hpp
View file

@ -468,7 +468,7 @@ class parser
{ {
case token_type::begin_object: case token_type::begin_object:
{ {
if (not sax->start_object()) if (JSON_UNLIKELY(not sax->start_object()))
{ {
return false; return false;
} }
@ -479,7 +479,7 @@ class parser
// closing } -> we are done // closing } -> we are done
if (last_token == token_type::end_object) if (last_token == token_type::end_object)
{ {
if (not sax->end_object()) if (JSON_UNLIKELY(not sax->end_object()))
{ {
return false; return false;
} }
@ -495,7 +495,7 @@ class parser
} }
else else
{ {
if (not sax->key(m_lexer.move_string())) if (JSON_UNLIKELY(not sax->key(m_lexer.move_string())))
{ {
return false; return false;
} }
@ -520,7 +520,7 @@ class parser
case token_type::begin_array: case token_type::begin_array:
{ {
if (not sax->start_array()) if (JSON_UNLIKELY(not sax->start_array()))
{ {
return false; return false;
} }
@ -531,7 +531,7 @@ class parser
// closing ] -> we are done // closing ] -> we are done
if (last_token == token_type::end_array) if (last_token == token_type::end_array)
{ {
if (not sax->end_array()) if (JSON_UNLIKELY(not sax->end_array()))
{ {
return false; return false;
} }
@ -557,7 +557,7 @@ class parser
} }
else else
{ {
if (not sax->number_float(res, m_lexer.move_string())) if (JSON_UNLIKELY(not sax->number_float(res, m_lexer.move_string())))
{ {
return false; return false;
} }
@ -567,7 +567,7 @@ class parser
case token_type::literal_false: case token_type::literal_false:
{ {
if (not sax->boolean(false)) if (JSON_UNLIKELY(not sax->boolean(false)))
{ {
return false; return false;
} }
@ -576,7 +576,7 @@ class parser
case token_type::literal_null: case token_type::literal_null:
{ {
if (not sax->null()) if (JSON_UNLIKELY(not sax->null()))
{ {
return false; return false;
} }
@ -585,7 +585,7 @@ class parser
case token_type::literal_true: case token_type::literal_true:
{ {
if (not sax->boolean(true)) if (JSON_UNLIKELY(not sax->boolean(true)))
{ {
return false; return false;
} }
@ -594,7 +594,7 @@ class parser
case token_type::value_integer: case token_type::value_integer:
{ {
if (not sax->number_integer(m_lexer.get_number_integer())) if (JSON_UNLIKELY(not sax->number_integer(m_lexer.get_number_integer())))
{ {
return false; return false;
} }
@ -603,7 +603,7 @@ class parser
case token_type::value_string: case token_type::value_string:
{ {
if (not sax->string(m_lexer.move_string())) if (JSON_UNLIKELY(not sax->string(m_lexer.move_string())))
{ {
return false; return false;
} }
@ -612,7 +612,7 @@ class parser
case token_type::value_unsigned: case token_type::value_unsigned:
{ {
if (not sax->number_unsigned(m_lexer.get_number_unsigned())) if (JSON_UNLIKELY(not sax->number_unsigned(m_lexer.get_number_unsigned())))
{ {
return false; return false;
} }
@ -664,7 +664,7 @@ class parser
// closing ] // closing ]
if (JSON_LIKELY(last_token == token_type::end_array)) if (JSON_LIKELY(last_token == token_type::end_array))
{ {
if (not sax->end_array()) if (JSON_UNLIKELY(not sax->end_array()))
{ {
return false; return false;
} }
@ -703,7 +703,7 @@ class parser
} }
else else
{ {
if (not sax->key(m_lexer.move_string())) if (JSON_UNLIKELY(not sax->key(m_lexer.move_string())))
{ {
return false; return false;
} }
@ -726,7 +726,7 @@ class parser
// closing } // closing }
if (JSON_LIKELY(last_token == token_type::end_object)) if (JSON_LIKELY(last_token == token_type::end_object))
{ {
if (not sax->end_object()) if (JSON_UNLIKELY(not sax->end_object()))
{ {
return false; return false;
} }

60
single_include/nlohmann/json.hpp
View file

@ -3415,24 +3415,18 @@ class json_sax_dom_parser : public json_sax<BasicJsonType>
} }
else else
{ {
switch (ref_stack.back()->m_type) assert(ref_stack.back()->is_array() or ref_stack.back()->is_object());
if (ref_stack.back()->is_array())
{ {
case value_t::array: ref_stack.back()->m_value.array->emplace_back(std::forward<Value>(v));
{
ref_stack.back()->m_value.array->push_back(BasicJsonType(std::forward<Value>(v)));
return &(ref_stack.back()->m_value.array->back()); return &(ref_stack.back()->m_value.array->back());
} }
else
case value_t::object:
{ {
assert(object_element); assert(object_element);
*object_element = BasicJsonType(std::forward<Value>(v)); *object_element = BasicJsonType(std::forward<Value>(v));
return object_element; return object_element;
} }
default:
assert(false); // LCOV_EXCL_LINE
}
} }
} }
@ -3534,6 +3528,7 @@ class json_sax_dom_callback_parser : public json_sax<BasicJsonType>
const bool keep = callback(ref_stack.size() - 1, parse_event_t::object_end, *ref_stack.back()); const bool keep = callback(ref_stack.size() - 1, parse_event_t::object_end, *ref_stack.back());
if (not keep) if (not keep)
{ {
// discard object
*ref_stack.back() = discarded; *ref_stack.back() = discarded;
} }
@ -3563,6 +3558,7 @@ class json_sax_dom_callback_parser : public json_sax<BasicJsonType>
const bool keep = callback(ref_stack.size() - 1, parse_event_t::array_end, *ref_stack.back()); const bool keep = callback(ref_stack.size() - 1, parse_event_t::array_end, *ref_stack.back());
if (not keep) if (not keep)
{ {
// discard array
*ref_stack.back() = discarded; *ref_stack.back() = discarded;
} }
@ -3624,24 +3620,18 @@ class json_sax_dom_callback_parser : public json_sax<BasicJsonType>
} }
else else
{ {
switch (ref_stack.back()->m_type) assert(ref_stack.back()->is_array() or ref_stack.back()->is_object());
if (ref_stack.back()->is_array())
{ {
case value_t::array: ref_stack.back()->m_value.array->emplace_back(std::forward<Value>(v));
{
ref_stack.back()->m_value.array->push_back(BasicJsonType(std::forward<Value>(v)));
return &(ref_stack.back()->m_value.array->back()); return &(ref_stack.back()->m_value.array->back());
} }
else
case value_t::object:
{ {
assert(object_element); assert(object_element);
*object_element = BasicJsonType(std::forward<Value>(v)); *object_element = BasicJsonType(std::forward<Value>(v));
return object_element; return object_element;
} }
default:
assert(false); // LCOV_EXCL_LINE
}
} }
} }
@ -4201,7 +4191,7 @@ class parser
{ {
case token_type::begin_object: case token_type::begin_object:
{ {
if (not sax->start_object()) if (JSON_UNLIKELY(not sax->start_object()))
{ {
return false; return false;
} }
@ -4212,7 +4202,7 @@ class parser
// closing } -> we are done // closing } -> we are done
if (last_token == token_type::end_object) if (last_token == token_type::end_object)
{ {
if (not sax->end_object()) if (JSON_UNLIKELY(not sax->end_object()))
{ {
return false; return false;
} }
@ -4228,7 +4218,7 @@ class parser
} }
else else
{ {
if (not sax->key(m_lexer.move_string())) if (JSON_UNLIKELY(not sax->key(m_lexer.move_string())))
{ {
return false; return false;
} }
@ -4253,7 +4243,7 @@ class parser
case token_type::begin_array: case token_type::begin_array:
{ {
if (not sax->start_array()) if (JSON_UNLIKELY(not sax->start_array()))
{ {
return false; return false;
} }
@ -4264,7 +4254,7 @@ class parser
// closing ] -> we are done // closing ] -> we are done
if (last_token == token_type::end_array) if (last_token == token_type::end_array)
{ {
if (not sax->end_array()) if (JSON_UNLIKELY(not sax->end_array()))
{ {
return false; return false;
} }
@ -4290,7 +4280,7 @@ class parser
} }
else else
{ {
if (not sax->number_float(res, m_lexer.move_string())) if (JSON_UNLIKELY(not sax->number_float(res, m_lexer.move_string())))
{ {
return false; return false;
} }
@ -4300,7 +4290,7 @@ class parser
case token_type::literal_false: case token_type::literal_false:
{ {
if (not sax->boolean(false)) if (JSON_UNLIKELY(not sax->boolean(false)))
{ {
return false; return false;
} }
@ -4309,7 +4299,7 @@ class parser
case token_type::literal_null: case token_type::literal_null:
{ {
if (not sax->null()) if (JSON_UNLIKELY(not sax->null()))
{ {
return false; return false;
} }
@ -4318,7 +4308,7 @@ class parser
case token_type::literal_true: case token_type::literal_true:
{ {
if (not sax->boolean(true)) if (JSON_UNLIKELY(not sax->boolean(true)))
{ {
return false; return false;
} }
@ -4327,7 +4317,7 @@ class parser
case token_type::value_integer: case token_type::value_integer:
{ {
if (not sax->number_integer(m_lexer.get_number_integer())) if (JSON_UNLIKELY(not sax->number_integer(m_lexer.get_number_integer())))
{ {
return false; return false;
} }
@ -4336,7 +4326,7 @@ class parser
case token_type::value_string: case token_type::value_string:
{ {
if (not sax->string(m_lexer.move_string())) if (JSON_UNLIKELY(not sax->string(m_lexer.move_string())))
{ {
return false; return false;
} }
@ -4345,7 +4335,7 @@ class parser
case token_type::value_unsigned: case token_type::value_unsigned:
{ {
if (not sax->number_unsigned(m_lexer.get_number_unsigned())) if (JSON_UNLIKELY(not sax->number_unsigned(m_lexer.get_number_unsigned())))
{ {
return false; return false;
} }
@ -4397,7 +4387,7 @@ class parser
// closing ] // closing ]
if (JSON_LIKELY(last_token == token_type::end_array)) if (JSON_LIKELY(last_token == token_type::end_array))
{ {
if (not sax->end_array()) if (JSON_UNLIKELY(not sax->end_array()))
{ {
return false; return false;
} }
@ -4436,7 +4426,7 @@ class parser
} }
else else
{ {
if (not sax->key(m_lexer.move_string())) if (JSON_UNLIKELY(not sax->key(m_lexer.move_string())))
{ {
return false; return false;
} }
@ -4459,7 +4449,7 @@ class parser
// closing } // closing }
if (JSON_LIKELY(last_token == token_type::end_object)) if (JSON_LIKELY(last_token == token_type::end_object))
{ {
if (not sax->end_object()) if (JSON_UNLIKELY(not sax->end_object()))
{ {
return false; return false;
} }