diff --git a/include/toml11/traits.hpp b/include/toml11/traits.hpp index 98dc059..7a8832f 100644 --- a/include/toml11/traits.hpp +++ b/include/toml11/traits.hpp @@ -83,6 +83,14 @@ struct has_into_toml_method_impl static std::false_type check(...); }; +struct has_template_into_toml_method_impl +{ + template + static std::true_type check(decltype(std::declval().template into_toml())*); + template + static std::false_type check(...); +}; + struct has_specialized_from_impl { template @@ -126,6 +134,9 @@ struct has_from_toml_method: decltype(has_from_toml_method_impl::check(nu template struct has_into_toml_method: decltype(has_into_toml_method_impl::check(nullptr)){}; +template +struct has_template_into_toml_method: decltype(has_template_into_toml_method_impl::check(nullptr)){}; + template struct has_specialized_from: decltype(has_specialized_from_impl::check(nullptr)){}; template diff --git a/include/toml11/value.hpp b/include/toml11/value.hpp index 5d70671..4cbab66 100644 --- a/include/toml11/value.hpp +++ b/include/toml11/value.hpp @@ -1151,6 +1151,29 @@ class basic_value *this = ud.into_toml(); return *this; } + + template, + cxx::negation> + >::value, std::nullptr_t> = nullptr> + basic_value(const T& ud): basic_value(ud.template into_toml()) {} + + template, + cxx::negation> + >::value, std::nullptr_t> = nullptr> + basic_value(const T& ud, std::vector com) + : basic_value(ud.template into_toml(), std::move(com)) + {} + template, + cxx::negation> + >::value, std::nullptr_t> = nullptr> + basic_value& operator=(const T& ud) + { + *this = ud.template into_toml(); + return *this; + } // }}} // empty value with region info ======================================= {{{ diff --git a/single_include/toml.hpp b/single_include/toml.hpp index f43cfd2..78e8603 100644 --- a/single_include/toml.hpp +++ b/single_include/toml.hpp @@ -3577,6 +3577,14 @@ struct has_into_toml_method_impl static std::false_type check(...); }; +struct has_template_into_toml_method_impl +{ + template + static std::true_type check(decltype(std::declval().template into_toml())*); + template + static std::false_type check(...); +}; + struct has_specialized_from_impl { template @@ -3620,6 +3628,9 @@ struct has_from_toml_method: decltype(has_from_toml_method_impl::check(nu template struct has_into_toml_method: decltype(has_into_toml_method_impl::check(nullptr)){}; +template +struct has_template_into_toml_method: decltype(has_template_into_toml_method_impl::check(nullptr)){}; + template struct has_specialized_from: decltype(has_specialized_from_impl::check(nullptr)){}; template @@ -6660,6 +6671,29 @@ class basic_value *this = ud.into_toml(); return *this; } + + template, + cxx::negation> + >::value, std::nullptr_t> = nullptr> + basic_value(const T& ud): basic_value(ud.template into_toml()) {} + + template, + cxx::negation> + >::value, std::nullptr_t> = nullptr> + basic_value(const T& ud, std::vector com) + : basic_value(ud.template into_toml(), std::move(com)) + {} + template, + cxx::negation> + >::value, std::nullptr_t> = nullptr> + basic_value& operator=(const T& ud) + { + *this = ud.template into_toml(); + return *this; + } // }}} // empty value with region info ======================================= {{{ diff --git a/tests/test_user_defined_conversion.cpp b/tests/test_user_defined_conversion.cpp index e8941ae..e7f8520 100644 --- a/tests/test_user_defined_conversion.cpp +++ b/tests/test_user_defined_conversion.cpp @@ -49,6 +49,25 @@ struct foobar int a; std::string b; }; + +struct corge +{ + int a; + std::string b; + + void from_toml(const toml::value& v) + { + this->a = toml::find(v, "a"); + this->b = toml::find(v, "b"); + return ; + } + + template + toml::basic_value into_toml() const + { + return toml::basic_value(typename toml::basic_value::table_type{{"a", this->a}, {"b", this->b}}); + } +}; } // extlib namespace toml @@ -215,6 +234,19 @@ TEST_CASE("test_conversion_by_member_methods") CHECK(v == v2); } + + { + const toml::value v(toml::table{{"a", 42}, {"b", "baz"}}); + + const auto corge = toml::get(v); + CHECK_EQ(corge.a, 42); + CHECK_EQ(corge.b, "baz"); + + const toml::value v2(corge); + + CHECK_EQ(v, v2); + } + { const toml::ordered_value v(toml::ordered_table{{"a", 42}, {"b", "baz"}});