haraldwolff/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2024-08-22 13:02:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

add some constexpr + noexcept

Browse source
This commit is contained in:
Théo DELRIEU 2017-01-09 00:06:25 +01:00
parent 29f9fe6ae9
commit 1f25ec5d36
2 changed files with 40 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/json.hpp
View file

@ -1789,15 +1789,16 @@ class basic_json
// - JSONSerializer::to_json exists for type T // - JSONSerializer::to_json exists for type T
// - T is not a istream, nor convertible to basic_json (float, vectors, etc) // - T is not a istream, nor convertible to basic_json (float, vectors, etc)
template <typename T, typename U = uncvref_t<T>, template <typename T, typename U = uncvref_t<T>,
enable_if_t< enable_if_t<not std::is_base_of<std::istream, U>::value and
not std::is_base_of<std::istream, U>::value and not std::is_same<U, basic_json_t>::value and
not std::is_same<U, basic_json_t>::value and not detail::is_basic_json_nested_type<
not detail::is_basic_json_nested_type<basic_json_t,U>::value and basic_json_t, U>::value and
detail::has_to_json<basic_json, U>::value, detail::has_to_json<basic_json, U>::value,
int> = 0> int> = 0>
basic_json(T &&val) basic_json(T &&val) noexcept(noexcept(JSONSerializer<U>::to_json(
std::declval<basic_json_t &>(), std::forward<T>(val))))
{ {
JSONSerializer<uncvref_t<T>>::to_json(*this, std::forward<T>(val)); JSONSerializer<U>::to_json(*this, std::forward<T>(val));
} }
/*! /*!
@ -2959,14 +2960,18 @@ class basic_json
// the latter is preferred if both are present (since it does not require a default construction of T) // the latter is preferred if both are present (since it does not require a default construction of T)
template < template <
typename T, typename T,
enable_if_t<not std::is_same<basic_json_t, uncvref_t<T>>::value and enable_if_t<
detail::has_from_json<basic_json_t, uncvref_t<T>>::value and not std::is_same<basic_json_t, uncvref_t<T>>::value and
not detail::has_non_default_from_json< detail::has_from_json<basic_json_t, uncvref_t<T>>::value and
basic_json_t, uncvref_t<T>>::value, not detail::has_non_default_from_json<basic_json_t,
int> = 0> uncvref_t<T>>::value,
int> = 0>
// do we really want the uncvref ? if a user call get<int &>, shouldn't we // do we really want the uncvref ? if a user call get<int &>, shouldn't we
// i know there is a special behaviour for boolean_t* and such
// static assert ? // static assert ?
auto get() const -> uncvref_t<T> auto get() const noexcept(noexcept(JSONSerializer<uncvref_t<T>>::from_json(
std::declval<basic_json_t const &>(), std::declval<uncvref_t<T> &>())))
-> uncvref_t<T>
{ {
using type = uncvref_t<T>; using type = uncvref_t<T>;
static_assert(std::is_default_constructible<type>::value && static_assert(std::is_default_constructible<type>::value &&
@ -2981,14 +2986,13 @@ class basic_json
// This overload is chosen when: // This overload is chosen when:
// - T is not basic_json_t // - T is not basic_json_t
// - and JSONSerializer<T>::from_json(basic_json const&) does not exist // - and JSONSerializer<T>::from_json(basic_json const&) does not exist
// TODO add constexpr, noexcept(...)
template < template <
typename T, typename T,
enable_if_t<not std::is_same<basic_json_t, uncvref_t<T>>::value and enable_if_t<not std::is_same<basic_json_t, uncvref_t<T>>::value and
detail::has_non_default_from_json<basic_json_t, detail::has_non_default_from_json<basic_json_t,
uncvref_t<T>>::value, uncvref_t<T>>::value,
int> = 0> int> = 0>
uncvref_t<T> get() const constexpr uncvref_t<T> get() const noexcept(noexcept(JSONSerializer<T>::from_json(std::declval<basic_json_t const&>())))
{ {
return JSONSerializer<T>::from_json(*this); return JSONSerializer<T>::from_json(*this);
} }

36
src/json.hpp.re2c
View file

@ -1789,15 +1789,16 @@ class basic_json
// - JSONSerializer::to_json exists for type T // - JSONSerializer::to_json exists for type T
// - T is not a istream, nor convertible to basic_json (float, vectors, etc) // - T is not a istream, nor convertible to basic_json (float, vectors, etc)
template <typename T, typename U = uncvref_t<T>, template <typename T, typename U = uncvref_t<T>,
enable_if_t< enable_if_t<not std::is_base_of<std::istream, U>::value and
not std::is_base_of<std::istream, U>::value and not std::is_same<U, basic_json_t>::value and
not std::is_same<U, basic_json_t>::value and not detail::is_basic_json_nested_type<
not detail::is_basic_json_nested_type<basic_json_t,U>::value and basic_json_t, U>::value and
detail::has_to_json<basic_json, U>::value, detail::has_to_json<basic_json, U>::value,
int> = 0> int> = 0>
basic_json(T &&val) basic_json(T &&val) noexcept(noexcept(JSONSerializer<U>::to_json(
std::declval<basic_json_t &>(), std::forward<T>(val))))
{ {
JSONSerializer<uncvref_t<T>>::to_json(*this, std::forward<T>(val)); JSONSerializer<U>::to_json(*this, std::forward<T>(val));
} }
/*! /*!
@ -2959,14 +2960,18 @@ class basic_json
// the latter is preferred if both are present (since it does not require a default construction of T) // the latter is preferred if both are present (since it does not require a default construction of T)
template < template <
typename T, typename T,
enable_if_t<not std::is_same<basic_json_t, uncvref_t<T>>::value and enable_if_t<
detail::has_from_json<basic_json_t, uncvref_t<T>>::value and not std::is_same<basic_json_t, uncvref_t<T>>::value and
not detail::has_non_default_from_json< detail::has_from_json<basic_json_t, uncvref_t<T>>::value and
basic_json_t, uncvref_t<T>>::value, not detail::has_non_default_from_json<basic_json_t,
int> = 0> uncvref_t<T>>::value,
int> = 0>
// do we really want the uncvref ? if a user call get<int &>, shouldn't we // do we really want the uncvref ? if a user call get<int &>, shouldn't we
// i know there is a special behaviour for boolean_t* and such
// static assert ? // static assert ?
auto get() const -> uncvref_t<T> auto get() const noexcept(noexcept(JSONSerializer<uncvref_t<T>>::from_json(
std::declval<basic_json_t const &>(), std::declval<uncvref_t<T> &>())))
-> uncvref_t<T>
{ {
using type = uncvref_t<T>; using type = uncvref_t<T>;
static_assert(std::is_default_constructible<type>::value && static_assert(std::is_default_constructible<type>::value &&
@ -2981,14 +2986,13 @@ class basic_json
// This overload is chosen when: // This overload is chosen when:
// - T is not basic_json_t // - T is not basic_json_t
// - and JSONSerializer<T>::from_json(basic_json const&) does not exist // - and JSONSerializer<T>::from_json(basic_json const&) does not exist
// TODO add constexpr, noexcept(...)
template < template <
typename T, typename T,
enable_if_t<not std::is_same<basic_json_t, uncvref_t<T>>::value and enable_if_t<not std::is_same<basic_json_t, uncvref_t<T>>::value and
detail::has_non_default_from_json<basic_json_t, detail::has_non_default_from_json<basic_json_t,
uncvref_t<T>>::value, uncvref_t<T>>::value,
int> = 0> int> = 0>
uncvref_t<T> get() const constexpr uncvref_t<T> get() const noexcept(noexcept(JSONSerializer<T>::from_json(std::declval<basic_json_t const&>())))
{ {
return JSONSerializer<T>::from_json(*this); return JSONSerializer<T>::from_json(*this);
} }