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

🔨 cleanup

Browse source
This commit is contained in:
Niels Lohmann 2018-03-17 23:31:18 +01:00
parent 606a25195f
commit 375b05a17d
No known key found for this signature in database
GPG key ID: 7F3CEA63AE251B69
2 changed files with 32 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -277,17 +277,23 @@ class json_sax_dom_parser : public json_sax<BasicJsonType>
} }
else else
{ {
assert(ref_stack.back()->is_array() or ref_stack.back()->is_object()); switch (ref_stack.back()->m_type)
if (ref_stack.back()->is_array())
{ {
ref_stack.back()->m_value.array->push_back(BasicJsonType(std::forward<Value>(v))); case value_t::array:
return &(ref_stack.back()->m_value.array->back()); {
} ref_stack.back()->m_value.array->push_back(BasicJsonType(std::forward<Value>(v)));
else return &(ref_stack.back()->m_value.array->back());
{ }
assert(object_element);
*object_element = BasicJsonType(std::forward<Value>(v)); case value_t::object:
return object_element; {
assert(object_element);
*object_element = BasicJsonType(std::forward<Value>(v));
return object_element;
}
default:
assert(false); // LCOV_EXCL_LINE
} }
} }
} }

26
single_include/nlohmann/json.hpp
View file

@ -3413,17 +3413,23 @@ class json_sax_dom_parser : public json_sax<BasicJsonType>
} }
else else
{ {
assert(ref_stack.back()->is_array() or ref_stack.back()->is_object()); switch (ref_stack.back()->m_type)
if (ref_stack.back()->is_array())
{ {
ref_stack.back()->m_value.array->push_back(BasicJsonType(std::forward<Value>(v))); case value_t::array:
return &(ref_stack.back()->m_value.array->back()); {
} ref_stack.back()->m_value.array->push_back(BasicJsonType(std::forward<Value>(v)));
else return &(ref_stack.back()->m_value.array->back());
{ }
assert(object_element);
*object_element = BasicJsonType(std::forward<Value>(v)); case value_t::object:
return object_element; {
assert(object_element);
*object_element = BasicJsonType(std::forward<Value>(v));
return object_element;
}
default:
assert(false); // LCOV_EXCL_LINE
} }
} }
} }