External/json
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

code refactoring, common sax_interface for all sax

Browse Source
This commit is contained in:
Luca 2022-04-13 02:42:48 +02:00
commit edf4b3e82e
2 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/nlohmann/detail/input/json_sax.hpp
View File

@ -242,7 +242,7 @@ class json_sax_exception_handler : public json_sax<BasicJsonType>
template<class Exception> template<class Exception>
bool handle_exception(const Exception& ex) bool handle_throw_exception(const Exception& ex)
{ {
errored = true; errored = true;
static_cast<void>(ex); static_cast<void>(ex);
@ -255,13 +255,13 @@ class json_sax_exception_handler : public json_sax<BasicJsonType>
virtual bool parse_error(std::size_t /*unused*/, const std::string& /*unused*/, const detail::exception& ex) override virtual bool parse_error(std::size_t /*unused*/, const std::string& /*unused*/, const detail::exception& ex) override
{ {
return handle_exception(ex); return handle_throw_exception(ex);
} }
template<class Exception> template<class Exception>
bool parse_error(std::size_t /*unused*/, const std::string& /*unused*/, const Exception& ex) bool parse_error(std::size_t /*unused*/, const std::string& /*unused*/, const Exception& ex)
{ {
return handle_exception(ex); return handle_throw_exception(ex);
} }
constexpr bool is_errored() const constexpr bool is_errored() const
@ -439,10 +439,7 @@ class json_sax_dom_callback_parser : public json_sax_exception_handler<BasicJson
json_sax_dom_callback_parser(BasicJsonType& r, json_sax_dom_callback_parser(BasicJsonType& r,
const parser_callback_t cb, const parser_callback_t cb,
const bool allow_exceptions_ = true) const bool allow_exceptions_ = true)
: root(r), callback(cb), json_sax_exception_handler<BasicJsonType> : root(r), callback(cb), json_sax_exception_handler<BasicJsonType>(allow_exceptions_)
{
allow_exceptions_
}
{ {
keep_stack.push_back(true); keep_stack.push_back(true);
} }

11
single_include/nlohmann/json.hpp
View File

@ -6140,7 +6140,7 @@ class json_sax_exception_handler : public json_sax<BasicJsonType>
template<class Exception> template<class Exception>
bool handle_exception(const Exception& ex) bool handle_throw_exception(const Exception& ex)
{ {
errored = true; errored = true;
static_cast<void>(ex); static_cast<void>(ex);
@ -6153,13 +6153,13 @@ class json_sax_exception_handler : public json_sax<BasicJsonType>
virtual bool parse_error(std::size_t /*unused*/, const std::string& /*unused*/, const detail::exception& ex) override virtual bool parse_error(std::size_t /*unused*/, const std::string& /*unused*/, const detail::exception& ex) override
{ {
return handle_exception(ex); return handle_throw_exception(ex);
} }
template<class Exception> template<class Exception>
bool parse_error(std::size_t /*unused*/, const std::string& /*unused*/, const Exception& ex) bool parse_error(std::size_t /*unused*/, const std::string& /*unused*/, const Exception& ex)
{ {
return handle_exception(ex); return handle_throw_exception(ex);
} }
constexpr bool is_errored() const constexpr bool is_errored() const
@ -6337,10 +6337,7 @@ class json_sax_dom_callback_parser : public json_sax_exception_handler<BasicJson
json_sax_dom_callback_parser(BasicJsonType& r, json_sax_dom_callback_parser(BasicJsonType& r,
const parser_callback_t cb, const parser_callback_t cb,
const bool allow_exceptions_ = true) const bool allow_exceptions_ = true)
: root(r), callback(cb), json_sax_exception_handler<BasicJsonType> : root(r), callback(cb), json_sax_exception_handler<BasicJsonType>(allow_exceptions_)
{
allow_exceptions_
}
{ {
keep_stack.push_back(true); keep_stack.push_back(true);
} }