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

♻️ simplify code

Browse Source
This commit is contained in:
Niels Lohmann 2021-10-17 13:38:52 +02:00
parent e9f7f1dab9
commit dcce56d925
No known key found for this signature in database
GPG Key ID: 7F3CEA63AE251B69
4 changed files with 48 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/nlohmann/detail/exceptions.hpp
View File

@ -198,7 +198,7 @@ class parse_error : public exception
{ {
std::string w = exception::name("parse_error", id_) + "parse error" + std::string w = exception::name("parse_error", id_) + "parse error" +
position_string(pos) + ": " + exception::diagnostics(context) + what_arg; position_string(pos) + ": " + exception::diagnostics(context) + what_arg;
return parse_error(id_, pos.chars_read_total, w.c_str()); return {id_, pos.chars_read_total, w.c_str()};
} }
template<typename BasicJsonType> template<typename BasicJsonType>
@ -207,7 +207,7 @@ class parse_error : public exception
std::string w = exception::name("parse_error", id_) + "parse error" + std::string w = exception::name("parse_error", id_) + "parse error" +
(byte_ != 0 ? (" at byte " + std::to_string(byte_)) : "") + (byte_ != 0 ? (" at byte " + std::to_string(byte_)) : "") +
": " + exception::diagnostics(context) + what_arg; ": " + exception::diagnostics(context) + what_arg;
return parse_error(id_, byte_, w.c_str()); return {id_, byte_, w.c_str()};
} }
/*! /*!
@ -276,7 +276,7 @@ class invalid_iterator : public exception
static invalid_iterator create(int id_, const std::string& what_arg, const BasicJsonType& context) static invalid_iterator create(int id_, const std::string& what_arg, const BasicJsonType& context)
{ {
std::string w = exception::name("invalid_iterator", id_) + exception::diagnostics(context) + what_arg; std::string w = exception::name("invalid_iterator", id_) + exception::diagnostics(context) + what_arg;
return invalid_iterator(id_, w.c_str()); return {id_, w.c_str()};
} }
private: private:
@ -331,7 +331,7 @@ class type_error : public exception
static type_error create(int id_, const std::string& what_arg, const BasicJsonType& context) static type_error create(int id_, const std::string& what_arg, const BasicJsonType& context)
{ {
std::string w = exception::name("type_error", id_) + exception::diagnostics(context) + what_arg; std::string w = exception::name("type_error", id_) + exception::diagnostics(context) + what_arg;
return type_error(id_, w.c_str()); return {id_, w.c_str()};
} }
private: private:
@ -379,7 +379,7 @@ class out_of_range : public exception
static out_of_range create(int id_, const std::string& what_arg, const BasicJsonType& context) static out_of_range create(int id_, const std::string& what_arg, const BasicJsonType& context)
{ {
std::string w = exception::name("out_of_range", id_) + exception::diagnostics(context) + what_arg; std::string w = exception::name("out_of_range", id_) + exception::diagnostics(context) + what_arg;
return out_of_range(id_, w.c_str()); return {id_, w.c_str()};
} }
private: private:
@ -418,7 +418,7 @@ class other_error : public exception
static other_error create(int id_, const std::string& what_arg, const BasicJsonType& context) static other_error create(int id_, const std::string& what_arg, const BasicJsonType& context)
{ {
std::string w = exception::name("other_error", id_) + exception::diagnostics(context) + what_arg; std::string w = exception::name("other_error", id_) + exception::diagnostics(context) + what_arg;
return other_error(id_, w.c_str()); return {id_, w.c_str()};
} }
private: private:

16
include/nlohmann/detail/output/serializer.hpp
View File

@ -9,6 +9,8 @@
#include <cstdio> // snprintf #include <cstdio> // snprintf
#include <limits> // numeric_limits #include <limits> // numeric_limits
#include <string> // string, char_traits #include <string> // string, char_traits
#include <iomanip> // setfill, setw
#include <sstream> // stringstream
#include <type_traits> // is_same #include <type_traits> // is_same
#include <utility> // move #include <utility> // move
@ -499,10 +501,9 @@ class serializer
{ {
case error_handler_t::strict: case error_handler_t::strict:
{ {
std::string sn(9, '\0'); std::stringstream ss;
// NOLINTNEXTLINE(cppcoreguidelines-pro-type-vararg,hicpp-vararg) ss << std::uppercase << std::setfill('0') << std::setw(4) << std::hex << byte;
(std::snprintf)(&sn[0], sn.size(), "%.2X", byte); JSON_THROW(type_error::create(316, "invalid UTF-8 byte at index " + std::to_string(i) + ": 0x" + ss.str(), BasicJsonType()));
JSON_THROW(type_error::create(316, "invalid UTF-8 byte at index " + std::to_string(i) + ": 0x" + sn, BasicJsonType()));
} }
case error_handler_t::ignore: case error_handler_t::ignore:
@ -594,10 +595,9 @@ class serializer
{ {
case error_handler_t::strict: case error_handler_t::strict:
{ {
std::string sn(9, '\0'); std::stringstream ss;
// NOLINTNEXTLINE(cppcoreguidelines-pro-type-vararg,hicpp-vararg) ss << std::uppercase << std::setfill('0') << std::setw(4) << std::hex << s.back();
(std::snprintf)(&sn[0], sn.size(), "%.2X", static_cast<std::uint8_t>(s.back())); JSON_THROW(type_error::create(316, "incomplete UTF-8 string; last byte: 0x" + ss.str(), BasicJsonType()));
JSON_THROW(type_error::create(316, "incomplete UTF-8 string; last byte: 0x" + sn, BasicJsonType()));
} }
case error_handler_t::ignore: case error_handler_t::ignore:

50
include/nlohmann/json.hpp
View File

@ -1073,64 +1073,34 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
} }
/// constructor for strings /// constructor for strings
json_value(const string_t& value) json_value(const string_t& value) : string(create<string_t>(value)) {}
{
string = create<string_t>(value);
}
/// constructor for rvalue strings /// constructor for rvalue strings
json_value(string_t&& value) json_value(string_t&& value) : string(create<string_t>(std::move(value))) {}
{
string = create<string_t>(std::move(value));
}
/// constructor for objects /// constructor for objects
json_value(const object_t& value) json_value(const object_t& value) : object(create<object_t>(value)) {}
{
object = create<object_t>(value);
}
/// constructor for rvalue objects /// constructor for rvalue objects
json_value(object_t&& value) json_value(object_t&& value) : object(create<object_t>(std::move(value))) {}
{
object = create<object_t>(std::move(value));
}
/// constructor for arrays /// constructor for arrays
json_value(const array_t& value) json_value(const array_t& value) : array(create<array_t>(value)) {}
{
array = create<array_t>(value);
}
/// constructor for rvalue arrays /// constructor for rvalue arrays
json_value(array_t&& value) json_value(array_t&& value) : array(create<array_t>(std::move(value))) {}
{
array = create<array_t>(std::move(value));
}
/// constructor for binary arrays /// constructor for binary arrays
json_value(const typename binary_t::container_type& value) json_value(const typename binary_t::container_type& value) : binary(create<binary_t>(value)) {}
{
binary = create<binary_t>(value);
}
/// constructor for rvalue binary arrays /// constructor for rvalue binary arrays
json_value(typename binary_t::container_type&& value) json_value(typename binary_t::container_type&& value) : binary(create<binary_t>(std::move(value))) {}
{
binary = create<binary_t>(std::move(value));
}
/// constructor for binary arrays (internal type) /// constructor for binary arrays (internal type)
json_value(const binary_t& value) json_value(const binary_t& value) : binary(create<binary_t>(value)) {}
{
binary = create<binary_t>(value);
}
/// constructor for rvalue binary arrays (internal type) /// constructor for rvalue binary arrays (internal type)
json_value(binary_t&& value) json_value(binary_t&& value) : binary(create<binary_t>(std::move(value))) {}
{
binary = create<binary_t>(std::move(value));
}
void destroy(value_t t) void destroy(value_t t)
{ {

78
single_include/nlohmann/json.hpp
View File

@ -2914,7 +2914,7 @@ class parse_error : public exception
{ {
std::string w = exception::name("parse_error", id_) + "parse error" + std::string w = exception::name("parse_error", id_) + "parse error" +
position_string(pos) + ": " + exception::diagnostics(context) + what_arg; position_string(pos) + ": " + exception::diagnostics(context) + what_arg;
return parse_error(id_, pos.chars_read_total, w.c_str()); return {id_, pos.chars_read_total, w.c_str()};
} }
template<typename BasicJsonType> template<typename BasicJsonType>
@ -2923,7 +2923,7 @@ class parse_error : public exception
std::string w = exception::name("parse_error", id_) + "parse error" + std::string w = exception::name("parse_error", id_) + "parse error" +
(byte_ != 0 ? (" at byte " + std::to_string(byte_)) : "") + (byte_ != 0 ? (" at byte " + std::to_string(byte_)) : "") +
": " + exception::diagnostics(context) + what_arg; ": " + exception::diagnostics(context) + what_arg;
return parse_error(id_, byte_, w.c_str()); return {id_, byte_, w.c_str()};
} }
/*! /*!
@ -2992,7 +2992,7 @@ class invalid_iterator : public exception
static invalid_iterator create(int id_, const std::string& what_arg, const BasicJsonType& context) static invalid_iterator create(int id_, const std::string& what_arg, const BasicJsonType& context)
{ {
std::string w = exception::name("invalid_iterator", id_) + exception::diagnostics(context) + what_arg; std::string w = exception::name("invalid_iterator", id_) + exception::diagnostics(context) + what_arg;
return invalid_iterator(id_, w.c_str()); return {id_, w.c_str()};
} }
private: private:
@ -3047,7 +3047,7 @@ class type_error : public exception
static type_error create(int id_, const std::string& what_arg, const BasicJsonType& context) static type_error create(int id_, const std::string& what_arg, const BasicJsonType& context)
{ {
std::string w = exception::name("type_error", id_) + exception::diagnostics(context) + what_arg; std::string w = exception::name("type_error", id_) + exception::diagnostics(context) + what_arg;
return type_error(id_, w.c_str()); return {id_, w.c_str()};
} }
private: private:
@ -3095,7 +3095,7 @@ class out_of_range : public exception
static out_of_range create(int id_, const std::string& what_arg, const BasicJsonType& context) static out_of_range create(int id_, const std::string& what_arg, const BasicJsonType& context)
{ {
std::string w = exception::name("out_of_range", id_) + exception::diagnostics(context) + what_arg; std::string w = exception::name("out_of_range", id_) + exception::diagnostics(context) + what_arg;
return out_of_range(id_, w.c_str()); return {id_, w.c_str()};
} }
private: private:
@ -3134,7 +3134,7 @@ class other_error : public exception
static other_error create(int id_, const std::string& what_arg, const BasicJsonType& context) static other_error create(int id_, const std::string& what_arg, const BasicJsonType& context)
{ {
std::string w = exception::name("other_error", id_) + exception::diagnostics(context) + what_arg; std::string w = exception::name("other_error", id_) + exception::diagnostics(context) + what_arg;
return other_error(id_, w.c_str()); return {id_, w.c_str()};
} }
private: private:
@ -15315,6 +15315,8 @@ class binary_writer
#include <cstdio> // snprintf #include <cstdio> // snprintf
#include <limits> // numeric_limits #include <limits> // numeric_limits
#include <string> // string, char_traits #include <string> // string, char_traits
#include <iomanip> // setfill, setw
#include <sstream> // stringstream
#include <type_traits> // is_same #include <type_traits> // is_same
#include <utility> // move #include <utility> // move
@ -16923,10 +16925,9 @@ class serializer
{ {
case error_handler_t::strict: case error_handler_t::strict:
{ {
std::string sn(9, '\0'); std::stringstream ss;
// NOLINTNEXTLINE(cppcoreguidelines-pro-type-vararg,hicpp-vararg) ss << std::uppercase << std::setfill('0') << std::setw(4) << std::hex << byte;
(std::snprintf)(&sn[0], sn.size(), "%.2X", byte); JSON_THROW(type_error::create(316, "invalid UTF-8 byte at index " + std::to_string(i) + ": 0x" + ss.str(), BasicJsonType()));
JSON_THROW(type_error::create(316, "invalid UTF-8 byte at index " + std::to_string(i) + ": 0x" + sn, BasicJsonType()));
} }
case error_handler_t::ignore: case error_handler_t::ignore:
@ -17018,10 +17019,9 @@ class serializer
{ {
case error_handler_t::strict: case error_handler_t::strict:
{ {
std::string sn(9, '\0'); std::stringstream ss;
// NOLINTNEXTLINE(cppcoreguidelines-pro-type-vararg,hicpp-vararg) ss << std::uppercase << std::setfill('0') << std::setw(4) << std::hex << s.back();
(std::snprintf)(&sn[0], sn.size(), "%.2X", static_cast<std::uint8_t>(s.back())); JSON_THROW(type_error::create(316, "incomplete UTF-8 string; last byte: 0x" + ss.str(), BasicJsonType()));
JSON_THROW(type_error::create(316, "incomplete UTF-8 string; last byte: 0x" + sn, BasicJsonType()));
} }
case error_handler_t::ignore: case error_handler_t::ignore:
@ -18574,64 +18574,34 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
} }
/// constructor for strings /// constructor for strings
json_value(const string_t& value) json_value(const string_t& value) : string(create<string_t>(value)) {}
{
string = create<string_t>(value);
}
/// constructor for rvalue strings /// constructor for rvalue strings
json_value(string_t&& value) json_value(string_t&& value) : string(create<string_t>(std::move(value))) {}
{
string = create<string_t>(std::move(value));
}
/// constructor for objects /// constructor for objects
json_value(const object_t& value) json_value(const object_t& value) : object(create<object_t>(value)) {}
{
object = create<object_t>(value);
}
/// constructor for rvalue objects /// constructor for rvalue objects
json_value(object_t&& value) json_value(object_t&& value) : object(create<object_t>(std::move(value))) {}
{
object = create<object_t>(std::move(value));
}
/// constructor for arrays /// constructor for arrays
json_value(const array_t& value) json_value(const array_t& value) : array(create<array_t>(value)) {}
{
array = create<array_t>(value);
}
/// constructor for rvalue arrays /// constructor for rvalue arrays
json_value(array_t&& value) json_value(array_t&& value) : array(create<array_t>(std::move(value))) {}
{
array = create<array_t>(std::move(value));
}
/// constructor for binary arrays /// constructor for binary arrays
json_value(const typename binary_t::container_type& value) json_value(const typename binary_t::container_type& value) : binary(create<binary_t>(value)) {}
{
binary = create<binary_t>(value);
}
/// constructor for rvalue binary arrays /// constructor for rvalue binary arrays
json_value(typename binary_t::container_type&& value) json_value(typename binary_t::container_type&& value) : binary(create<binary_t>(std::move(value))) {}
{
binary = create<binary_t>(std::move(value));
}
/// constructor for binary arrays (internal type) /// constructor for binary arrays (internal type)
json_value(const binary_t& value) json_value(const binary_t& value) : binary(create<binary_t>(value)) {}
{
binary = create<binary_t>(value);
}
/// constructor for rvalue binary arrays (internal type) /// constructor for rvalue binary arrays (internal type)
json_value(binary_t&& value) json_value(binary_t&& value) : binary(create<binary_t>(std::move(value))) {}
{
binary = create<binary_t>(std::move(value));
}
void destroy(value_t t) void destroy(value_t t)
{ {