boostorg/variant2
1
0
Fork 1
mirror of https://github.com/boostorg/variant2.git synced 2025-07-29 19:57:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add test/variant_subset

Browse Source
This commit is contained in:
Peter Dimov
2017-06-03 00:27:52 +03:00
parent 8765ee1983
commit 369781b623
4 changed files with 162 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/boost/variant2/expected.hpp
View File

@ -370,7 +370,7 @@ public:
return mp_with_index<mp_size<expected>>( v_.index(), [&]( auto I ) {
return _remap_error<R>( I, f, get<I>(v_) );
return this->_remap_error<R>( I, f, get<I>(v_) );
});
}
@ -383,7 +383,7 @@ public:
return mp_with_index<mp_size<expected>>( v_.index(), [&]( auto I ) {
return _remap_error<R>( I, f, get<I>(v_) );
return this->_remap_error<R>( I, f, get<I>(v_) );
});
}

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

@ -1064,7 +1064,7 @@ public:
using J = mp_find<mp_list<U...>, mp_at_c<mp_list<T...>, I>>;
return _subset_impl<U...>( J{}, this->_get_impl( I ) );
return this->_subset_impl<U...>( J{}, this->_get_impl( I ) );
});
}
@ -1077,7 +1077,7 @@ public:
using J = mp_find<mp_list<U...>, mp_at_c<mp_list<T...>, I>>;
return _subset_impl<U...>( J{}, this->_get_impl( I ) );
return this->_subset_impl<U...>( J{}, this->_get_impl( I ) );
});
}
@ -1090,7 +1090,7 @@ public:
using J = mp_find<mp_list<U...>, mp_at_c<mp_list<T...>, I>>;
return _subset_impl<U...>( J{}, std::move( this->_get_impl( I ) ) );
return this->_subset_impl<U...>( J{}, std::move( this->_get_impl( I ) ) );
});
}
@ -1103,7 +1103,7 @@ public:
using J = mp_find<mp_list<U...>, mp_at_c<mp_list<T...>, I>>;
return _subset_impl<U...>( J{}, std::move( this->_get_impl( I ) ) );
return this->_subset_impl<U...>( J{}, std::move( this->_get_impl( I ) ) );
});
}

1
test/Jamfile
View File

@ -40,3 +40,4 @@ run variant_destroy.cpp : : : $(REQ) ;
run variant_visit.cpp : : : $(REQ) ;
run variant_lt_gt.cpp : : : $(REQ) ;
run variant_convert_construct.cpp : : : $(REQ) ;
run variant_subset.cpp : : : $(REQ) ;

155
test/variant_subset.cpp Normal file
View File

@ -0,0 +1,155 @@
// Copyright 2017 Peter Dimov.
//
// Distributed under the Boost Software License, Version 1.0.
//
// See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt
#include <boost/variant2/variant.hpp>
#include <boost/core/lightweight_test.hpp>
#include <boost/core/lightweight_test_trait.hpp>
#include <type_traits>
#include <utility>
#include <string>
using namespace boost::variant2;
#define STATIC_ASSERT(...) static_assert(__VA_ARGS__, #__VA_ARGS__)
struct X1
{
int v;
X1(): v(0) {}
explicit X1(int v): v(v) {}
X1(X1 const& r): v(r.v) {}
X1(X1&& r): v(r.v) {}
X1& operator=( X1 const& r ) { v = r.v; return *this; }
X1& operator=( X1&& r ) { v = r.v; return *this; }
};
inline bool operator==( X1 const& a, X1 const& b ) { return a.v == b.v; }
STATIC_ASSERT( !std::is_nothrow_default_constructible<X1>::value );
STATIC_ASSERT( !std::is_nothrow_copy_constructible<X1>::value );
STATIC_ASSERT( !std::is_nothrow_move_constructible<X1>::value );
STATIC_ASSERT( !std::is_nothrow_copy_assignable<X1>::value );
STATIC_ASSERT( !std::is_nothrow_move_assignable<X1>::value );
struct X2
{
int v;
X2(): v(0) {}
explicit X2(int v): v(v) {}
X2(X2 const& r): v(r.v) {}
X2(X2&& r): v(r.v) {}
X2& operator=( X2 const& r ) { v = r.v; return *this; }
X2& operator=( X2&& r ) { v = r.v; return *this; }
};
inline bool operator==( X2 const& a, X2 const& b ) { return a.v == b.v; }
STATIC_ASSERT( !std::is_nothrow_default_constructible<X2>::value );
STATIC_ASSERT( !std::is_nothrow_copy_constructible<X2>::value );
STATIC_ASSERT( !std::is_nothrow_move_constructible<X2>::value );
STATIC_ASSERT( !std::is_nothrow_copy_assignable<X2>::value );
STATIC_ASSERT( !std::is_nothrow_move_assignable<X2>::value );
int main()
{
{
variant<int, float> v1( 1 );
variant<int> v2 = v1.subset<int>();
BOOST_TEST( holds_alternative<int>( v2 ) );
BOOST_TEST_EQ( get<int>( v1 ), get<int>( v2 ) );
BOOST_TEST_THROWS( v1.subset<float>(), bad_variant_access );
variant<int> v3 = std::move(v1).subset<int>();
BOOST_TEST( holds_alternative<int>( v3 ) );
BOOST_TEST_EQ( get<int>( v2 ), get<int>( v3 ) );
BOOST_TEST_THROWS( std::move(v1).subset<float>(), bad_variant_access );
}
{
variant<int, float> const v1( 1 );
variant<int> v2 = v1.subset<int>();
BOOST_TEST( holds_alternative<int>( v2 ) );
BOOST_TEST_EQ( get<int>( v1 ), get<int>( v2 ) );
BOOST_TEST_THROWS( v1.subset<float>(), bad_variant_access );
variant<int> v3 = std::move(v1).subset<int>();
BOOST_TEST( holds_alternative<int>( v3 ) );
BOOST_TEST_EQ( get<int>( v2 ), get<int>( v3 ) );
BOOST_TEST_THROWS( std::move(v1).subset<float>(), bad_variant_access );
}
{
variant<int, float> v1( 1 );
variant<int, float> v2 = v1.subset<int, float>();
BOOST_TEST( holds_alternative<int>( v2 ) );
BOOST_TEST_EQ( get<int>( v1 ), get<int>( v2 ) );
variant<int, float> v3 = std::move(v1).subset<int, float>();
BOOST_TEST( holds_alternative<int>( v3 ) );
BOOST_TEST_EQ( get<int>( v2 ), get<int>( v3 ) );
}
{
variant<int, float> v1( 1 );
variant<float, int> v2 = v1.subset<float, int>();
BOOST_TEST( holds_alternative<int>( v2 ) );
BOOST_TEST_EQ( get<int>( v1 ), get<int>( v2 ) );
variant<float, int> v3 = std::move(v1).subset<float, int>();
BOOST_TEST( holds_alternative<int>( v3 ) );
BOOST_TEST_EQ( get<int>( v2 ), get<int>( v3 ) );
}
{
variant<int, float, std::string> v1( "s1" );
variant<int, std::string> v2 = v1.subset<int, std::string>();
BOOST_TEST( holds_alternative<std::string>( v2 ) );
BOOST_TEST_EQ( get<std::string>( v1 ), get<std::string>( v2 ) );
variant<float, std::string> v3 = std::move(v1).subset<float, std::string>();
BOOST_TEST( holds_alternative<std::string>( v3 ) );
BOOST_TEST_EQ( get<std::string>( v2 ), get<std::string>( v3 ) );
}
{
variant<int, int, float, float, X1, X2> v1{ X1{1} };
variant<X1, X2> v2 = v1.subset<X1, X2>();
BOOST_TEST( holds_alternative<X1>( v2 ) );
BOOST_TEST_EQ( get<X1>( v1 ).v, get<X1>( v2 ).v );
variant<X1, X2> v3 = std::move( v1 ).subset<X1, X2>();
BOOST_TEST( holds_alternative<X1>( v3 ) );
BOOST_TEST_EQ( get<X1>( v2 ).v, get<X1>( v3 ).v );
}
return boost::report_errors();
}