zhangyiss/toml11
1
0
Fork 0
mirror of https://github.com/ToruNiina/toml11.git synced 2025-12-16 03:08:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into v3

Browse Source
This commit is contained in:
ToruNiina
2019-06-19 19:53:08 +09:00
parent 9a47c2a15a 4a2c823d56
commit 9663a6bbdb
5 changed files with 100 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -101,5 +101,5 @@ install(EXPORT toml11Targets
)
if (toml11_BUILD_TEST)
add_subdirectory(tests)
add_subdirectory(tests)
endif ()

19
toml/get.hpp
View File

@@ -702,10 +702,13 @@ get_or(const basic_value<C, M, V>& v, T&& opt)
template<typename T, typename C,
template<typename ...> class M, template<typename ...> class V>
detail::enable_if_t<detail::conjunction<
detail::negation<detail::is_exact_toml_type<T, basic_value<C, M, V>>>,
detail::negation<detail::is_exact_toml_type<
typename std::remove_cv<typename std::remove_reference<T>::type>::type,
basic_value<C, M, V>>>,
detail::negation<std::is_same<std::string,
typename std::remove_cv<typename std::remove_reference<T>::type>::type>>,
detail::negation<detail::is_string_literal<typename std::remove_reference<T>::type>>
detail::negation<detail::is_string_literal<
typename std::remove_reference<T>::type>>
>::value, typename std::remove_reference<T>::type>
get_or(const basic_value<C, M, V>& v, T&& opt)
{
@@ -790,7 +793,7 @@ detail::enable_if_t<std::is_same<T, std::string>::value, std::string>
find_or(basic_value<C, M, V>&& v, const toml::key& ky, T&& opt)
{
if(!v.is_table()) {return std::forward<T>(opt);}
auto tab = toml::get<toml::table>(std::move(v));
auto tab = std::move(v).as_table();
if(tab.count(ky) == 0) {return std::forward<T>(opt);}
return get_or(std::move(tab.at(ky)), std::forward<T>(opt));
}
@@ -815,9 +818,13 @@ find_or(const basic_value<C, M, V>& v, const toml::key& ky, T&& opt)
template<typename T, typename C,
template<typename ...> class M, template<typename ...> class V>
detail::enable_if_t<detail::conjunction<
detail::negation<detail::is_exact_toml_type<T, basic_value<C, M, V>>>,
detail::negation<std::is_same<T, std::string>>,
detail::negation<detail::is_string_literal<typename std::remove_reference<T>::type>>
detail::negation<detail::is_exact_toml_type<
typename std::remove_cv<typename std::remove_reference<T>::type>::type,
basic_value<C, M, V>>>,
detail::negation<std::is_same<std::string,
typename std::remove_cv<typename std::remove_reference<T>::type>::type>>,
detail::negation<detail::is_string_literal<
typename std::remove_reference<T>::type>>
>::value, T>
find_or(const basic_value<C, M, V>& v, const toml::key& ky, T&& opt)
{

8
toml/traits.hpp
View File

@@ -50,6 +50,12 @@ struct has_resize_method_impl
template<typename T> static std::false_type check(...);
};
struct is_comparable_impl
{
template<typename T> static std::true_type check(decltype(std::declval<T>() < std::declval<T>())*);
template<typename T> static std::false_type check(...);
};
struct has_from_toml_method_impl
{
template<typename T, typename C,
@@ -86,6 +92,8 @@ template<typename T>
struct has_mapped_type : decltype(has_mapped_type_impl::check<T>(nullptr)){};
template<typename T>
struct has_resize_method : decltype(has_resize_method_impl::check<T>(nullptr)){};
template<typename T>
struct is_comparable : decltype(is_comparable_impl::check<T>(nullptr)){};
template<typename T, typename C,
template<typename ...> class Tb, template<typename ...> class A>

68
toml/value.hpp
View File

@@ -1375,7 +1375,6 @@ operator==(const basic_value<C, T, A>& lhs, const basic_value<C, T, A>& rhs)
{
if(lhs.type() != rhs.type()) {return false;}
if(lhs.comments() != rhs.comments()) {return false;}
switch(lhs.type())
{
case value_t::boolean :
@@ -1422,8 +1421,26 @@ operator==(const basic_value<C, T, A>& lhs, const basic_value<C, T, A>& rhs)
default: {return false;}
}
}
template<typename C, template<typename ...> class T, template<typename ...> class A>
inline bool
inline bool operator!=(const basic_value<C, T, A>& lhs, const basic_value<C, T, A>& rhs)
{
return !(lhs == rhs);
}
template<typename C, template<typename ...> class T, template<typename ...> class A>
typename std::enable_if<detail::conjunction<
detail::is_comparable<typename basic_value<C, T, A>::boolean_type >,
detail::is_comparable<typename basic_value<C, T, A>::integer_type >,
detail::is_comparable<typename basic_value<C, T, A>::floating_type >,
detail::is_comparable<typename basic_value<C, T, A>::string_type >,
detail::is_comparable<typename basic_value<C, T, A>::local_time_type >,
detail::is_comparable<typename basic_value<C, T, A>::local_date_type >,
detail::is_comparable<typename basic_value<C, T, A>::local_datetime_type >,
detail::is_comparable<typename basic_value<C, T, A>::offset_datetime_type >,
detail::is_comparable<typename basic_value<C, T, A>::array_type >,
detail::is_comparable<typename basic_value<C, T, A>::table_type >
>::value, bool>::type
operator<(const basic_value<C, T, A>& lhs, const basic_value<C, T, A>& rhs)
{
if(lhs.type() != rhs.type()){return (lhs.type() < rhs.type());}
@@ -1501,22 +1518,53 @@ operator<(const basic_value<C, T, A>& lhs, const basic_value<C, T, A>& rhs)
}
template<typename C, template<typename ...> class T, template<typename ...> class A>
inline bool operator!=(const basic_value<C, T, A>& lhs, const basic_value<C, T, A>& rhs)
{
return !(lhs == rhs);
}
template<typename C, template<typename ...> class T, template<typename ...> class A>
inline bool operator<=(const basic_value<C, T, A>& lhs, const basic_value<C, T, A>& rhs)
typename std::enable_if<detail::conjunction<
detail::is_comparable<typename basic_value<C, T, A>::boolean_type >,
detail::is_comparable<typename basic_value<C, T, A>::integer_type >,
detail::is_comparable<typename basic_value<C, T, A>::floating_type >,
detail::is_comparable<typename basic_value<C, T, A>::string_type >,
detail::is_comparable<typename basic_value<C, T, A>::local_time_type >,
detail::is_comparable<typename basic_value<C, T, A>::local_date_type >,
detail::is_comparable<typename basic_value<C, T, A>::local_datetime_type >,
detail::is_comparable<typename basic_value<C, T, A>::offset_datetime_type >,
detail::is_comparable<typename basic_value<C, T, A>::array_type >,
detail::is_comparable<typename basic_value<C, T, A>::table_type >
>::value, bool>::type
operator<=(const basic_value<C, T, A>& lhs, const basic_value<C, T, A>& rhs)
{
return (lhs < rhs) || (lhs == rhs);
}
template<typename C, template<typename ...> class T, template<typename ...> class A>
inline bool operator>(const basic_value<C, T, A>& lhs, const basic_value<C, T, A>& rhs)
typename std::enable_if<detail::conjunction<
detail::is_comparable<typename basic_value<C, T, A>::boolean_type >,
detail::is_comparable<typename basic_value<C, T, A>::integer_type >,
detail::is_comparable<typename basic_value<C, T, A>::floating_type >,
detail::is_comparable<typename basic_value<C, T, A>::string_type >,
detail::is_comparable<typename basic_value<C, T, A>::local_time_type >,
detail::is_comparable<typename basic_value<C, T, A>::local_date_type >,
detail::is_comparable<typename basic_value<C, T, A>::local_datetime_type >,
detail::is_comparable<typename basic_value<C, T, A>::offset_datetime_type >,
detail::is_comparable<typename basic_value<C, T, A>::array_type >,
detail::is_comparable<typename basic_value<C, T, A>::table_type >
>::value, bool>::type
operator>(const basic_value<C, T, A>& lhs, const basic_value<C, T, A>& rhs)
{
return !(lhs <= rhs);
}
template<typename C, template<typename ...> class T, template<typename ...> class A>
inline bool operator>=(const basic_value<C, T, A>& lhs, const basic_value<C, T, A>& rhs)
typename std::enable_if<detail::conjunction<
detail::is_comparable<typename basic_value<C, T, A>::boolean_type >,
detail::is_comparable<typename basic_value<C, T, A>::integer_type >,
detail::is_comparable<typename basic_value<C, T, A>::floating_type >,
detail::is_comparable<typename basic_value<C, T, A>::string_type >,
detail::is_comparable<typename basic_value<C, T, A>::local_time_type >,
detail::is_comparable<typename basic_value<C, T, A>::local_date_type >,
detail::is_comparable<typename basic_value<C, T, A>::local_datetime_type >,
detail::is_comparable<typename basic_value<C, T, A>::offset_datetime_type >,
detail::is_comparable<typename basic_value<C, T, A>::array_type >,
detail::is_comparable<typename basic_value<C, T, A>::table_type >
>::value, bool>::type
operator>=(const basic_value<C, T, A>& lhs, const basic_value<C, T, A>& rhs)
{
return !(lhs < rhs);
}