feedc0de/boost_variant2
1
0
Fork 0
forked from boostorg/variant2
Code Pull Requests Activity

Use mp_for_index_c

Browse Source
This commit is contained in:
Peter Dimov
2017-05-31 20:29:57 +03:00
parent b7d039e30f
commit ef849a0feb
1 changed files with 54 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

133
include/boost/variant2/variant.hpp
View File

@@ -536,18 +536,16 @@ template<class... T> struct variant_base_impl<false, true, T...>
void _destroy() noexcept void _destroy() noexcept
{ {
mp_for_each<mp_iota_c<sizeof...(T)>>([&]( auto I ){ if( ix_ > 0 )
using U = mp_at_c<variant<T...>, I>;
constexpr auto J = decltype(I)::value + 1;
if( J == ix_ )
{ {
st1_.get( mp_size_t<J>() ).~U(); mp_for_index_c<1 + sizeof...(T)>( ix_, [&]( auto I ){
}
using U = mp_at_c<mp_list<none, T...>, I>;
st1_.get( I ).~U();
}); });
} }
}
~variant_base_impl() noexcept ~variant_base_impl() noexcept
{ {
@@ -635,23 +633,25 @@ template<class... T> struct variant_base_impl<false, false, T...>
void _destroy() noexcept void _destroy() noexcept
{ {
mp_for_each<mp_iota_c<sizeof...(T)>>([&]( auto I ){ if( ix_ > 0 )
using U = mp_at_c<variant<T...>, I>;
constexpr auto J = decltype(I)::value + 1;
if( ix_ > 0 && J == ix_ )
{ {
st1_.get( mp_size_t<J>() ).~U(); mp_for_index_c<1 + sizeof...(T)>( ix_, [&]( auto I ){
}
if( ix_ < 0 && J == -ix_ ) using U = mp_at_c<mp_list<none, T...>, I>;
{ st1_.get( I ).~U();
st2_.get( mp_size_t<J>() ).~U();
}
}); });
} }
else if( ix_ < 0 )
{
mp_for_index_c<1 + sizeof...(T)>( -ix_, [&]( auto I ){
using U = mp_at_c<mp_list<none, T...>, I>;
st2_.get( I ).~U();
});
}
}
~variant_base_impl() noexcept ~variant_base_impl() noexcept
{ {
@@ -810,12 +810,9 @@ public:
variant( variant const& r ) variant( variant const& r )
noexcept( mp_all<std::is_nothrow_copy_constructible<T>...>::value ) noexcept( mp_all<std::is_nothrow_copy_constructible<T>...>::value )
{ {
mp_for_each<mp_iota_c<sizeof...(T)>>([&]( auto I ){ mp_for_index_c<sizeof...(T)>( r.index(), [&]( auto I ){
if( I == r.index() )
{
::new( static_cast<variant_base*>(this) ) variant_base( I, r._get_impl( I ) ); ::new( static_cast<variant_base*>(this) ) variant_base( I, r._get_impl( I ) );
}
}); });
} }
@@ -824,12 +821,9 @@ public:
variant( variant && r ) variant( variant && r )
noexcept( mp_all<std::is_nothrow_move_constructible<T>...>::value ) noexcept( mp_all<std::is_nothrow_move_constructible<T>...>::value )
{ {
mp_for_each<mp_iota_c<sizeof...(T)>>([&]( auto I ){ mp_for_index_c<sizeof...(T)>( r.index(), [&]( auto I ){
if( I == r.index() )
{
::new( static_cast<variant_base*>(this) ) variant_base( I, std::move( r._get_impl( I ) ) ); ::new( static_cast<variant_base*>(this) ) variant_base( I, std::move( r._get_impl( I ) ) );
}
}); });
} }
@@ -871,20 +865,15 @@ public:
variant& operator=( variant const & r ) variant& operator=( variant const & r )
noexcept( mp_all<std::is_nothrow_copy_constructible<T>..., std::is_nothrow_copy_assignable<T>...>::value ) noexcept( mp_all<std::is_nothrow_copy_constructible<T>..., std::is_nothrow_copy_assignable<T>...>::value )
{ {
mp_for_each<mp_iota_c<sizeof...(T)>>([&]( auto I ){ mp_for_index_c<sizeof...(T)>( r.index(), [&]( auto I ){
constexpr auto J = I.value; if( this->index() == I )
if( J == r.index() )
{ {
if( this->index() == J ) get<I>(*this) = get<I>(r);
{
get<J>(*this) = get<J>(r);
} }
else else
{ {
this->variant_base::template emplace<J>( get<J>(r) ); this->variant_base::template emplace<I>( get<I>(r) );
}
} }
}); });
@@ -896,20 +885,15 @@ public:
variant& operator=( variant && r ) variant& operator=( variant && r )
noexcept( mp_all<std::is_nothrow_move_constructible<T>..., std::is_nothrow_move_assignable<T>...>::value ) noexcept( mp_all<std::is_nothrow_move_constructible<T>..., std::is_nothrow_move_assignable<T>...>::value )
{ {
mp_for_each<mp_iota_c<sizeof...(T)>>([&]( auto I ){ mp_for_index_c<sizeof...(T)>( r.index(), [&]( auto I ){
constexpr auto J = I.value; if( this->index() == I )
if( J == r.index() )
{ {
if( this->index() == J ) get<I>(*this) = get<I>(std::move(r));
{
get<J>(*this) = get<J>(std::move(r));
} }
else else
{ {
this->variant_base::template emplace<J>( get<J>(std::move(r)) ); this->variant_base::template emplace<I>( get<I>(std::move(r)) );
}
} }
}); });
@@ -982,15 +966,10 @@ public:
{ {
if( index() == r.index() ) if( index() == r.index() )
{ {
mp_for_each<mp_iota_c<sizeof...(T)>>([&]( auto I ){ mp_for_index_c<sizeof...(T)>( index(), [&]( auto I ){
constexpr auto J = I.value;
if( J == this->index() )
{
using std::swap; using std::swap;
swap( get<J>(*this), get<J>(r) ); swap( get<I>(*this), get<I>(r) );
}
}); });
} }
@@ -1017,30 +996,22 @@ template<class... T> constexpr bool operator==( variant<T...> const & v, variant
{ {
if( v.index() != w.index() ) return false; if( v.index() != w.index() ) return false;
bool r = false; return mp_for_index_c<sizeof...(T)>( v.index(), [&]( auto I ){
mp_for_each<mp_iota_c<sizeof...(T)>>([&]( auto I ){ return get<I>(v) == get<I>(w);
if( I == v.index() ) r = get<I>(v) == get<I>(w);
}); });
return r;
} }
template<class... T> constexpr bool operator!=( variant<T...> const & v, variant<T...> const & w ) template<class... T> constexpr bool operator!=( variant<T...> const & v, variant<T...> const & w )
{ {
if( v.index() != w.index() ) return true; if( v.index() != w.index() ) return true;
bool r = true; return mp_for_index_c<sizeof...(T)>( v.index(), [&]( auto I ){
mp_for_each<mp_iota_c<sizeof...(T)>>([&]( auto I ){ return get<I>(v) != get<I>(w);
if( I == v.index() ) r = get<I>(v) != get<I>(w);
}); });
return r;
} }
template<class... T> constexpr bool operator<( variant<T...> const & v, variant<T...> const & w ) template<class... T> constexpr bool operator<( variant<T...> const & v, variant<T...> const & w )
@@ -1048,15 +1019,11 @@ template<class... T> constexpr bool operator<( variant<T...> const & v, variant<
if( v.index() < w.index() ) return true; if( v.index() < w.index() ) return true;
if( v.index() > w.index() ) return false; if( v.index() > w.index() ) return false;
bool r = false; return mp_for_index_c<sizeof...(T)>( v.index(), [&]( auto I ){
mp_for_each<mp_iota_c<sizeof...(T)>>([&]( auto I ){ return get<I>(v) < get<I>(w);
if( I == v.index() ) r = get<I>(v) < get<I>(w);
}); });
return r;
} }
template<class... T> constexpr bool operator>( variant<T...> const & v, variant<T...> const & w ) template<class... T> constexpr bool operator>( variant<T...> const & v, variant<T...> const & w )
@@ -1064,15 +1031,11 @@ template<class... T> constexpr bool operator>( variant<T...> const & v, variant
if( v.index() > w.index() ) return true; if( v.index() > w.index() ) return true;
if( v.index() < w.index() ) return false; if( v.index() < w.index() ) return false;
bool r = false; return mp_for_index_c<sizeof...(T)>( v.index(), [&]( auto I ){
mp_for_each<mp_iota_c<sizeof...(T)>>([&]( auto I ){ return get<I>(v) > get<I>(w);
if( I == v.index() ) r = get<I>(v) > get<I>(w);
}); });
return r;
} }
template<class... T> constexpr bool operator<=( variant<T...> const & v, variant<T...> const & w ) template<class... T> constexpr bool operator<=( variant<T...> const & v, variant<T...> const & w )
@@ -1080,15 +1043,11 @@ template<class... T> constexpr bool operator<=( variant<T...> const & v, variant
if( v.index() < w.index() ) return true; if( v.index() < w.index() ) return true;
if( v.index() > w.index() ) return false; if( v.index() > w.index() ) return false;
bool r = false; return mp_for_index_c<sizeof...(T)>( v.index(), [&]( auto I ){
mp_for_each<mp_iota_c<sizeof...(T)>>([&]( auto I ){ return get<I>(v) <= get<I>(w);
if( I == v.index() ) r = get<I>(v) <= get<I>(w);
}); });
return r;
} }
template<class... T> constexpr bool operator>=( variant<T...> const & v, variant<T...> const & w ) template<class... T> constexpr bool operator>=( variant<T...> const & v, variant<T...> const & w )
@@ -1096,15 +1055,11 @@ template<class... T> constexpr bool operator>=( variant<T...> const & v, variant
if( v.index() > w.index() ) return true; if( v.index() > w.index() ) return true;
if( v.index() < w.index() ) return false; if( v.index() < w.index() ) return false;
bool r = false; return mp_for_index_c<sizeof...(T)>( v.index(), [&]( auto I ){
mp_for_each<mp_iota_c<sizeof...(T)>>([&]( auto I ){ return get<I>(v) >= get<I>(w);
if( I == v.index() ) r = get<I>(v) >= get<I>(w);
}); });
return r;
} }
// visitation // visitation