diff options
Diffstat (limited to 'libstdc++-v3/include/std/variant')
| -rw-r--r-- | libstdc++-v3/include/std/variant | 186 |
1 files changed, 124 insertions, 62 deletions
diff --git a/libstdc++-v3/include/std/variant b/libstdc++-v3/include/std/variant index f79d95db7a8..371cbb90f54 100644 --- a/libstdc++-v3/include/std/variant +++ b/libstdc++-v3/include/std/variant @@ -33,6 +33,7 @@ #define __glibcxx_want_freestanding_variant #define __glibcxx_want_variant +#define __glibcxx_want_constrained_equality #include <bits/version.h> #ifdef __cpp_lib_variant // C++ >= 17 @@ -42,11 +43,12 @@ #include <bits/exception_defines.h> #include <bits/functional_hash.h> #include <bits/invoke.h> -#include <bits/parse_numbers.h> +#include <bits/parse_numbers.h> // _Select_int #include <bits/stl_iterator_base_funcs.h> #include <bits/stl_construct.h> #include <bits/utility.h> // in_place_index_t #if __cplusplus >= 202002L +# include <concepts> # include <compare> #endif @@ -1236,39 +1238,125 @@ namespace __variant struct monostate { }; -#define _VARIANT_RELATION_FUNCTION_TEMPLATE(__OP, __NAME) \ - template<typename... _Types> \ - constexpr bool operator __OP(const variant<_Types...>& __lhs, \ - const variant<_Types...>& __rhs) \ - { \ - bool __ret = true; \ - __detail::__variant::__raw_idx_visit( \ - [&__ret, &__lhs] (auto&& __rhs_mem, auto __rhs_index) mutable \ - { \ - if constexpr (__rhs_index != variant_npos) \ - { \ - if (__lhs.index() == __rhs_index) \ - { \ - auto& __this_mem = std::get<__rhs_index>(__lhs); \ - __ret = __this_mem __OP __rhs_mem; \ - } \ - else \ - __ret = (__lhs.index() + 1) __OP (__rhs_index + 1); \ - } \ - else \ - __ret = (__lhs.index() + 1) __OP (__rhs_index + 1); \ - }, __rhs); \ - return __ret; \ +namespace __detail::__variant +{ + template<typename _Ret, typename _Vp, typename _Op> + constexpr _Ret + __compare(_Ret __ret, const _Vp& __lhs, const _Vp& __rhs, _Op __op) + { + __variant::__raw_idx_visit( + [&__ret, &__lhs, __op] (auto&& __rhs_mem, auto __rhs_index) mutable + { + if constexpr (__rhs_index != variant_npos) + { + if (__lhs.index() == __rhs_index.value) + { + auto& __this_mem = std::get<__rhs_index>(__lhs); + __ret = __op(__this_mem, __rhs_mem); + return; + } + } + __ret = __op(__lhs.index() + 1, __rhs_index + 1); + }, __rhs); + return __ret; + } +} // namespace __detail::__variant + + template<typename... _Types> +#if __cpp_lib_concepts + requires ((requires (const _Types& __t) { + { __t == __t } -> convertible_to<bool>; }) && ...) +#endif + constexpr bool + operator== [[nodiscard]] (const variant<_Types...>& __lhs, + const variant<_Types...>& __rhs) + { + namespace __variant = __detail::__variant; + return __variant::__compare(true, __lhs, __rhs, + [](auto&& __l, auto&& __r) -> bool { + return __l == __r; + }); + } + + template<typename... _Types> +#if __cpp_lib_concepts + requires ((requires (const _Types& __t) { + { __t != __t } -> convertible_to<bool>; }) && ...) +#endif + constexpr bool + operator!= [[nodiscard]] (const variant<_Types...>& __lhs, + const variant<_Types...>& __rhs) + { + namespace __variant = __detail::__variant; + return __variant::__compare(true, __lhs, __rhs, + [](auto&& __l, auto&& __r) -> bool { + return __l != __r; + }); + } + + template<typename... _Types> +#if __cpp_lib_concepts + requires ((requires (const _Types& __t) { + { __t < __t } -> convertible_to<bool>; }) && ...) +#endif + constexpr bool + operator< [[nodiscard]] (const variant<_Types...>& __lhs, + const variant<_Types...>& __rhs) + { + namespace __variant = __detail::__variant; + return __variant::__compare(true, __lhs, __rhs, + [](auto&& __l, auto&& __r) -> bool { + return __l < __r; + }); } - _VARIANT_RELATION_FUNCTION_TEMPLATE(<, less) - _VARIANT_RELATION_FUNCTION_TEMPLATE(<=, less_equal) - _VARIANT_RELATION_FUNCTION_TEMPLATE(==, equal) - _VARIANT_RELATION_FUNCTION_TEMPLATE(!=, not_equal) - _VARIANT_RELATION_FUNCTION_TEMPLATE(>=, greater_equal) - _VARIANT_RELATION_FUNCTION_TEMPLATE(>, greater) + template<typename... _Types> +#if __cpp_lib_concepts + requires ((requires (const _Types& __t) { + { __t <= __t } -> convertible_to<bool>; }) && ...) +#endif + constexpr bool + operator<= [[nodiscard]] (const variant<_Types...>& __lhs, + const variant<_Types...>& __rhs) + { + namespace __variant = __detail::__variant; + return __variant::__compare(true, __lhs, __rhs, + [](auto&& __l, auto&& __r) -> bool { + return __l <= __r; + }); + } -#undef _VARIANT_RELATION_FUNCTION_TEMPLATE + template<typename... _Types> +#if __cpp_lib_concepts + requires ((requires (const _Types& __t) { + { __t > __t } -> convertible_to<bool>; }) && ...) +#endif + constexpr bool + operator> [[nodiscard]] (const variant<_Types...>& __lhs, + const variant<_Types...>& __rhs) + { + namespace __variant = __detail::__variant; + return __variant::__compare(true, __lhs, __rhs, + [](auto&& __l, auto&& __r) -> bool { + return __l > __r; + }); + } + + template<typename... _Types> +#if __cpp_lib_concepts + requires ((requires (const _Types& __t) { + { __t >= __t } -> convertible_to<bool>; }) && ...) +#endif + constexpr bool + operator>= [[nodiscard]] (const variant<_Types...>& __lhs, + const variant<_Types...>& __rhs) + { + namespace __variant = __detail::__variant; + return __variant::__compare(true, __lhs, __rhs, + [](auto&& __l, auto&& __r) -> bool { + return __l >= __r; + }); + } constexpr bool operator==(monostate, monostate) noexcept { return true; } @@ -1281,22 +1369,11 @@ namespace __variant { common_comparison_category_t<compare_three_way_result_t<_Types>...> __ret = strong_ordering::equal; - - __detail::__variant::__raw_idx_visit( - [&__ret, &__v] (auto&& __w_mem, auto __w_index) mutable - { - if constexpr (__w_index != variant_npos) - { - if (__v.index() == __w_index) - { - auto& __this_mem = std::get<__w_index>(__v); - __ret = __this_mem <=> __w_mem; - return; - } - } - __ret = (__v.index() + 1) <=> (__w_index + 1); - }, __w); - return __ret; + namespace __variant = __detail::__variant; + return __variant::__compare(__ret, __v, __w, + [](auto&& __l, auto&& __r) { + return __l <=> __r; + }); } constexpr strong_ordering @@ -1690,21 +1767,6 @@ namespace __variant template<size_t _Np, typename _Vp> friend constexpr decltype(auto) __detail::__variant::__get(_Vp&& __v) noexcept; - -#define _VARIANT_RELATION_FUNCTION_TEMPLATE(__OP) \ - template<typename... _Tp> \ - friend constexpr bool \ - operator __OP(const variant<_Tp...>& __lhs, \ - const variant<_Tp...>& __rhs); - - _VARIANT_RELATION_FUNCTION_TEMPLATE(<) - _VARIANT_RELATION_FUNCTION_TEMPLATE(<=) - _VARIANT_RELATION_FUNCTION_TEMPLATE(==) - _VARIANT_RELATION_FUNCTION_TEMPLATE(!=) - _VARIANT_RELATION_FUNCTION_TEMPLATE(>=) - _VARIANT_RELATION_FUNCTION_TEMPLATE(>) - -#undef _VARIANT_RELATION_FUNCTION_TEMPLATE }; template<size_t _Np, typename... _Types> |