Skip to content

J
json
Commit 034d5ed9 by Niels Lohmann Committed by Théo DELRIEU
Options

💄 some cleanup

parent be1d3de4
Showing with 50 additions and 62 deletions
src/json.hpp
...@@ -141,7 +141,8 @@ using is_unscoped_enum = ...@@ -141,7 +141,8 @@ using is_unscoped_enum =
namespace detail namespace detail
{ {
// Very useful construct against boilerplate (more boilerplate needed than in C++17: http://en.cppreference.com/w/cpp/types/void_t) // very useful construct against boilerplate (more boilerplate needed than in
// C++17: http://en.cppreference.com/w/cpp/types/void_t)
template <typename...> struct make_void template <typename...> struct make_void
{ {
using type = void; using type = void;
...@@ -174,29 +175,29 @@ struct disjunction<B1, Bn...> ...@@ -174,29 +175,29 @@ struct disjunction<B1, Bn...>
/*! /*!
@brief Helper to determine whether there's a key_type for T. @brief Helper to determine whether there's a key_type for T.
Thus helper is used to tell associative containers apart from other containers
This helper is used to tell associative containers apart from other containers
such as sequence containers. For instance, `std::map` passes the test as it such as sequence containers. For instance, `std::map` passes the test as it
contains a `mapped_type`, whereas `std::vector` fails the test. contains a `mapped_type`, whereas `std::vector` fails the test.
@sa http://stackoverflow.com/a/7728728/266378 @sa http://stackoverflow.com/a/7728728/266378
@since version 1.0.0, overworked in version 2.0.6 @since version 1.0.0, overworked in version 2.0.6
*/ */
#define NLOHMANN_JSON_HAS_HELPER(type) \ #define NLOHMANN_JSON_HAS_HELPER(type) \
template <typename T> struct has_##type { \ template <typename T> struct has_##type { \
private: \ private: \
template <typename U, typename = typename U::type> \ template <typename U, typename = typename U::type> \
static int detect(U &&); \ static int detect(U &&); \
\ static void detect(...); \
static void detect(...); \ public: \
\ static constexpr bool value = \
public: \ std::is_integral<decltype(detect(std::declval<T>()))>::value; \
static constexpr bool value = \
std::is_integral<decltype(detect(std::declval<T>()))>::value; \
}; };
NLOHMANN_JSON_HAS_HELPER(mapped_type) NLOHMANN_JSON_HAS_HELPER(mapped_type);
NLOHMANN_JSON_HAS_HELPER(key_type) NLOHMANN_JSON_HAS_HELPER(key_type);
NLOHMANN_JSON_HAS_HELPER(value_type) NLOHMANN_JSON_HAS_HELPER(value_type);
NLOHMANN_JSON_HAS_HELPER(iterator) NLOHMANN_JSON_HAS_HELPER(iterator);
#undef NLOHMANN_JSON_HAS_HELPER #undef NLOHMANN_JSON_HAS_HELPER
...@@ -216,8 +217,8 @@ struct is_compatible_object_type_impl<true, RealType, CompatibleObjectType> ...@@ -216,8 +217,8 @@ struct is_compatible_object_type_impl<true, RealType, CompatibleObjectType>
template<class RealType, class CompatibleObjectType> template<class RealType, class CompatibleObjectType>
struct is_compatible_object_type struct is_compatible_object_type
{ {
// As noted ahead, we need to stop evaluating traits if CompatibleObjectType = void // As noted ahead, we need to stop evaluating traits if
// hence the conjunction // `CompatibleObjectType = void`, hence the conjunction
static auto constexpr value = is_compatible_object_type_impl < static auto constexpr value = is_compatible_object_type_impl <
conjunction<negation<std::is_same<void, CompatibleObjectType>>, conjunction<negation<std::is_same<void, CompatibleObjectType>>,
has_mapped_type<CompatibleObjectType>, has_mapped_type<CompatibleObjectType>,
...@@ -249,8 +250,8 @@ struct is_compatible_array_type_impl<true, BasicJson, CompatibleArrayType> ...@@ -249,8 +250,8 @@ struct is_compatible_array_type_impl<true, BasicJson, CompatibleArrayType>
template <class BasicJson, class CompatibleArrayType> template <class BasicJson, class CompatibleArrayType>
struct is_compatible_array_type struct is_compatible_array_type
{ {
// the check for CompatibleArrayType = void is done in is_compatible_object_type // the check for CompatibleArrayType = void is done in
// but we need the conjunction here as well // `is_compatible_object_type`, but we need the conjunction here as well
static auto constexpr value = is_compatible_array_type_impl < static auto constexpr value = is_compatible_array_type_impl <
conjunction<negation<is_compatible_object_type< conjunction<negation<is_compatible_object_type<
typename BasicJson::object_t, CompatibleArrayType>>, typename BasicJson::object_t, CompatibleArrayType>>,
...@@ -302,8 +303,7 @@ struct is_compatible_basic_json_type ...@@ -302,8 +303,7 @@ struct is_compatible_basic_json_type
is_compatible_array_type<BasicJson, T>::value or is_compatible_array_type<BasicJson, T>::value or
is_compatible_object_type<typename BasicJson::object_t, T>::value or is_compatible_object_type<typename BasicJson::object_t, T>::value or
is_compatible_float_type<typename BasicJson::number_float_t, T>::value or is_compatible_float_type<typename BasicJson::number_float_t, T>::value or
is_compatible_integer_type<typename BasicJson::number_integer_t, is_compatible_integer_type<typename BasicJson::number_integer_t, T>::value or
T>::value or
is_compatible_integer_type<typename BasicJson::number_unsigned_t, is_compatible_integer_type<typename BasicJson::number_unsigned_t,
T>::value; T>::value;
}; };
...@@ -320,8 +320,7 @@ struct is_basic_json_nested_class ...@@ -320,8 +320,7 @@ struct is_basic_json_nested_class
}; };
// This trait checks if JSONSerializer<T>::from_json(json const&, udt&) exists // This trait checks if JSONSerializer<T>::from_json(json const&, udt&) exists
template <template <typename, typename> class JSONSerializer, typename Json, template <template <typename, typename> class JSONSerializer, typename Json, typename T>
typename T>
struct has_from_json struct has_from_json
{ {
private: private:
...@@ -329,7 +328,6 @@ struct has_from_json ...@@ -329,7 +328,6 @@ struct has_from_json
template <typename U, typename = enable_if_t<std::is_same<void, decltype(uncvref_t<U>::from_json( template <typename U, typename = enable_if_t<std::is_same<void, decltype(uncvref_t<U>::from_json(
std::declval<Json>(), std::declval<T&>()))>::value>> std::declval<Json>(), std::declval<T&>()))>::value>>
static int detect(U&&); static int detect(U&&);
static void detect(...); static void detect(...);
public: public:
...@@ -346,7 +344,6 @@ struct has_non_default_from_json ...@@ -346,7 +344,6 @@ struct has_non_default_from_json
private: private:
template <typename U, typename = enable_if_t<std::is_same<T, decltype(uncvref_t<U>::from_json(std::declval<Json>()))>::value>> template <typename U, typename = enable_if_t<std::is_same<T, decltype(uncvref_t<U>::from_json(std::declval<Json>()))>::value>>
static int detect(U&&); static int detect(U&&);
static void detect(...); static void detect(...);
public: public:
...@@ -363,7 +360,6 @@ struct has_to_json ...@@ -363,7 +360,6 @@ struct has_to_json
template <typename U, typename = decltype(uncvref_t<U>::to_json( template <typename U, typename = decltype(uncvref_t<U>::to_json(
std::declval<Json&>(), std::declval<T>()))> std::declval<Json&>(), std::declval<T>()))>
static int detect(U&&); static int detect(U&&);
static void detect(...); static void detect(...);
public: public:
...@@ -1598,8 +1594,7 @@ class basic_json ...@@ -1598,8 +1594,7 @@ class basic_json
@since version 1.0.0 @since version 1.0.0
*/ */
template <class CompatibleArrayType, template <class CompatibleArrayType,
enable_if_t<detail::is_compatible_array_type< enable_if_t<detail::is_compatible_array_type<basic_json_t, CompatibleArrayType>::value,
basic_json_t, CompatibleArrayType>::value,
int> = 0> int> = 0>
basic_json(const CompatibleArrayType& val) : m_type(value_t::array) basic_json(const CompatibleArrayType& val) : m_type(value_t::array)
{ {
...@@ -1620,7 +1615,6 @@ class basic_json ...@@ -1620,7 +1615,6 @@ class basic_json
not detail::is_basic_json_nested_class<uncvref_t<T>, basic_json_t, primitive_iterator_t>::value and not detail::is_basic_json_nested_class<uncvref_t<T>, basic_json_t, primitive_iterator_t>::value and
not std::is_same<uncvref_t<T>, typename basic_json_t::array_t::iterator>::value and not std::is_same<uncvref_t<T>, typename basic_json_t::array_t::iterator>::value and
not std::is_same<uncvref_t<T>, typename basic_json_t::object_t::iterator>::value and not std::is_same<uncvref_t<T>, typename basic_json_t::object_t::iterator>::value and
detail::conjunction<detail::negation<detail::is_compatible_basic_json_type< detail::conjunction<detail::negation<detail::is_compatible_basic_json_type<
uncvref_t<T>, basic_json_t>>, uncvref_t<T>, basic_json_t>>,
detail::has_to_json<JSONSerializer, basic_json, detail::has_to_json<JSONSerializer, basic_json,
......
src/json.hpp.re2c
...@@ -141,7 +141,8 @@ using is_unscoped_enum = ...@@ -141,7 +141,8 @@ using is_unscoped_enum =
namespace detail namespace detail
{ {
// Very useful construct against boilerplate (more boilerplate needed than in C++17: http://en.cppreference.com/w/cpp/types/void_t) // very useful construct against boilerplate (more boilerplate needed than in
// C++17: http://en.cppreference.com/w/cpp/types/void_t)
template <typename...> struct make_void template <typename...> struct make_void
{ {
using type = void; using type = void;
...@@ -174,29 +175,29 @@ struct disjunction<B1, Bn...> ...@@ -174,29 +175,29 @@ struct disjunction<B1, Bn...>
/*! /*!
@brief Helper to determine whether there's a key_type for T. @brief Helper to determine whether there's a key_type for T.
Thus helper is used to tell associative containers apart from other containers
This helper is used to tell associative containers apart from other containers
such as sequence containers. For instance, `std::map` passes the test as it such as sequence containers. For instance, `std::map` passes the test as it
contains a `mapped_type`, whereas `std::vector` fails the test. contains a `mapped_type`, whereas `std::vector` fails the test.
@sa http://stackoverflow.com/a/7728728/266378 @sa http://stackoverflow.com/a/7728728/266378
@since version 1.0.0, overworked in version 2.0.6 @since version 1.0.0, overworked in version 2.0.6
*/ */
#define NLOHMANN_JSON_HAS_HELPER(type) \ #define NLOHMANN_JSON_HAS_HELPER(type) \
template <typename T> struct has_##type { \ template <typename T> struct has_##type { \
private: \ private: \
template <typename U, typename = typename U::type> \ template <typename U, typename = typename U::type> \
static int detect(U &&); \ static int detect(U &&); \
\ static void detect(...); \
static void detect(...); \ public: \
\ static constexpr bool value = \
public: \ std::is_integral<decltype(detect(std::declval<T>()))>::value; \
static constexpr bool value = \
std::is_integral<decltype(detect(std::declval<T>()))>::value; \
}; };
NLOHMANN_JSON_HAS_HELPER(mapped_type) NLOHMANN_JSON_HAS_HELPER(mapped_type);
NLOHMANN_JSON_HAS_HELPER(key_type) NLOHMANN_JSON_HAS_HELPER(key_type);
NLOHMANN_JSON_HAS_HELPER(value_type) NLOHMANN_JSON_HAS_HELPER(value_type);
NLOHMANN_JSON_HAS_HELPER(iterator) NLOHMANN_JSON_HAS_HELPER(iterator);
#undef NLOHMANN_JSON_HAS_HELPER #undef NLOHMANN_JSON_HAS_HELPER
...@@ -216,8 +217,8 @@ struct is_compatible_object_type_impl<true, RealType, CompatibleObjectType> ...@@ -216,8 +217,8 @@ struct is_compatible_object_type_impl<true, RealType, CompatibleObjectType>
template<class RealType, class CompatibleObjectType> template<class RealType, class CompatibleObjectType>
struct is_compatible_object_type struct is_compatible_object_type
{ {
// As noted ahead, we need to stop evaluating traits if CompatibleObjectType = void // As noted ahead, we need to stop evaluating traits if
// hence the conjunction // `CompatibleObjectType = void`, hence the conjunction
static auto constexpr value = is_compatible_object_type_impl < static auto constexpr value = is_compatible_object_type_impl <
conjunction<negation<std::is_same<void, CompatibleObjectType>>, conjunction<negation<std::is_same<void, CompatibleObjectType>>,
has_mapped_type<CompatibleObjectType>, has_mapped_type<CompatibleObjectType>,
...@@ -249,8 +250,8 @@ struct is_compatible_array_type_impl<true, BasicJson, CompatibleArrayType> ...@@ -249,8 +250,8 @@ struct is_compatible_array_type_impl<true, BasicJson, CompatibleArrayType>
template <class BasicJson, class CompatibleArrayType> template <class BasicJson, class CompatibleArrayType>
struct is_compatible_array_type struct is_compatible_array_type
{ {
// the check for CompatibleArrayType = void is done in is_compatible_object_type // the check for CompatibleArrayType = void is done in
// but we need the conjunction here as well // `is_compatible_object_type`, but we need the conjunction here as well
static auto constexpr value = is_compatible_array_type_impl < static auto constexpr value = is_compatible_array_type_impl <
conjunction<negation<is_compatible_object_type< conjunction<negation<is_compatible_object_type<
typename BasicJson::object_t, CompatibleArrayType>>, typename BasicJson::object_t, CompatibleArrayType>>,
...@@ -302,8 +303,7 @@ struct is_compatible_basic_json_type ...@@ -302,8 +303,7 @@ struct is_compatible_basic_json_type
is_compatible_array_type<BasicJson, T>::value or is_compatible_array_type<BasicJson, T>::value or
is_compatible_object_type<typename BasicJson::object_t, T>::value or is_compatible_object_type<typename BasicJson::object_t, T>::value or
is_compatible_float_type<typename BasicJson::number_float_t, T>::value or is_compatible_float_type<typename BasicJson::number_float_t, T>::value or
is_compatible_integer_type<typename BasicJson::number_integer_t, is_compatible_integer_type<typename BasicJson::number_integer_t, T>::value or
T>::value or
is_compatible_integer_type<typename BasicJson::number_unsigned_t, is_compatible_integer_type<typename BasicJson::number_unsigned_t,
T>::value; T>::value;
}; };
...@@ -320,8 +320,7 @@ struct is_basic_json_nested_class ...@@ -320,8 +320,7 @@ struct is_basic_json_nested_class
}; };
// This trait checks if JSONSerializer<T>::from_json(json const&, udt&) exists // This trait checks if JSONSerializer<T>::from_json(json const&, udt&) exists
template <template <typename, typename> class JSONSerializer, typename Json, template <template <typename, typename> class JSONSerializer, typename Json, typename T>
typename T>
struct has_from_json struct has_from_json
{ {
private: private:
...@@ -329,7 +328,6 @@ struct has_from_json ...@@ -329,7 +328,6 @@ struct has_from_json
template <typename U, typename = enable_if_t<std::is_same<void, decltype(uncvref_t<U>::from_json( template <typename U, typename = enable_if_t<std::is_same<void, decltype(uncvref_t<U>::from_json(
std::declval<Json>(), std::declval<T&>()))>::value>> std::declval<Json>(), std::declval<T&>()))>::value>>
static int detect(U&&); static int detect(U&&);
static void detect(...); static void detect(...);
public: public:
...@@ -346,7 +344,6 @@ struct has_non_default_from_json ...@@ -346,7 +344,6 @@ struct has_non_default_from_json
private: private:
template <typename U, typename = enable_if_t<std::is_same<T, decltype(uncvref_t<U>::from_json(std::declval<Json>()))>::value>> template <typename U, typename = enable_if_t<std::is_same<T, decltype(uncvref_t<U>::from_json(std::declval<Json>()))>::value>>
static int detect(U&&); static int detect(U&&);
static void detect(...); static void detect(...);
public: public:
...@@ -363,7 +360,6 @@ struct has_to_json ...@@ -363,7 +360,6 @@ struct has_to_json
template <typename U, typename = decltype(uncvref_t<U>::to_json( template <typename U, typename = decltype(uncvref_t<U>::to_json(
std::declval<Json&>(), std::declval<T>()))> std::declval<Json&>(), std::declval<T>()))>
static int detect(U&&); static int detect(U&&);
static void detect(...); static void detect(...);
public: public:
...@@ -1599,8 +1595,7 @@ class basic_json ...@@ -1599,8 +1595,7 @@ class basic_json
@since version 1.0.0 @since version 1.0.0
*/ */
template <class CompatibleArrayType, template <class CompatibleArrayType,
enable_if_t<detail::is_compatible_array_type< enable_if_t<detail::is_compatible_array_type<basic_json_t, CompatibleArrayType>::value,
basic_json_t, CompatibleArrayType>::value,
int> = 0> int> = 0>
basic_json(const CompatibleArrayType& val) : m_type(value_t::array) basic_json(const CompatibleArrayType& val) : m_type(value_t::array)
{ {
...@@ -1621,7 +1616,6 @@ class basic_json ...@@ -1621,7 +1616,6 @@ class basic_json
not detail::is_basic_json_nested_class<uncvref_t<T>, basic_json_t, primitive_iterator_t>::value and not detail::is_basic_json_nested_class<uncvref_t<T>, basic_json_t, primitive_iterator_t>::value and
not std::is_same<uncvref_t<T>, typename basic_json_t::array_t::iterator>::value and not std::is_same<uncvref_t<T>, typename basic_json_t::array_t::iterator>::value and
not std::is_same<uncvref_t<T>, typename basic_json_t::object_t::iterator>::value and not std::is_same<uncvref_t<T>, typename basic_json_t::object_t::iterator>::value and
detail::conjunction<detail::negation<detail::is_compatible_basic_json_type< detail::conjunction<detail::negation<detail::is_compatible_basic_json_type<
uncvref_t<T>, basic_json_t>>, uncvref_t<T>, basic_json_t>>,
detail::has_to_json<JSONSerializer, basic_json, detail::has_to_json<JSONSerializer, basic_json,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment