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

🔨 overwork binary subtypes

Browse source
This commit is contained in:
Niels Lohmann 2020-05-17 13:51:59 +02:00
parent ab6e76dd05
commit dead99eb0e
No known key found for this signature in database
GPG key ID: 7F3CEA63AE251B69
8 changed files with 195 additions and 117 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -27,7 +27,7 @@ struct json_sax
using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
using number_float_t = typename BasicJsonType::number_float_t;
using string_t = typename BasicJsonType::string_t;
using binary_t = typename BasicJsonType::binary_t;
using internal_binary_t = typename BasicJsonType::internal_binary_t;
/*!
@brief a null value was read
@ -78,7 +78,7 @@ struct json_sax
@return whether parsing should proceed
@note It is safe to move the passed binary.
*/
virtual bool binary(binary_t& val) = 0;
virtual bool binary(internal_binary_t& val) = 0;
/*!
@brief the beginning of an object was read
@ -154,7 +154,7 @@ class json_sax_dom_parser
using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
using number_float_t = typename BasicJsonType::number_float_t;
using string_t = typename BasicJsonType::string_t;
using binary_t = typename BasicJsonType::binary_t;
using internal_binary_t = typename BasicJsonType::internal_binary_t;
/*!
@param[in, out] r reference to a JSON value that is manipulated while
@ -208,9 +208,9 @@ class json_sax_dom_parser
return true;
}
bool binary(binary_t& val)
bool binary(internal_binary_t& val)
{
handle_value(BasicJsonType::binary_array(std::move(val)));
handle_value(std::move(val));
return true;
}
@ -343,7 +343,7 @@ class json_sax_dom_callback_parser
using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
using number_float_t = typename BasicJsonType::number_float_t;
using string_t = typename BasicJsonType::string_t;
using binary_t = typename BasicJsonType::binary_t;
using internal_binary_t = typename BasicJsonType::internal_binary_t;
using parser_callback_t = typename BasicJsonType::parser_callback_t;
using parse_event_t = typename BasicJsonType::parse_event_t;
@ -398,9 +398,9 @@ class json_sax_dom_callback_parser
return true;
}
bool binary(binary_t& val)
bool binary(internal_binary_t& val)
{
handle_value(BasicJsonType::binary_array(val));
handle_value(std::move(val));
return true;
}
@ -654,7 +654,7 @@ class json_sax_acceptor
using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
using number_float_t = typename BasicJsonType::number_float_t;
using string_t = typename BasicJsonType::string_t;
using binary_t = typename BasicJsonType::binary_t;
using internal_binary_t = typename BasicJsonType::internal_binary_t;
bool null()
{
@ -686,7 +686,7 @@ class json_sax_acceptor
return true;
}
bool binary(binary_t& /*unused*/)
bool binary(internal_binary_t& /*unused*/)
{
return true;
}