Sync from upstream.

This commit is contained in:
Rene Rivera
2024-04-10 07:55:53 -05:00
4 changed files with 233 additions and 6 deletions

View File

@ -17,7 +17,11 @@ environment:
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
TOOLSET: msvc-14.1
CXXSTD: 14,17,latest
ADDRMD: 32,64
ADDRMD: 32
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
TOOLSET: msvc-14.1
CXXSTD: 14,17,latest
ADDRMD: 64
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
ADDPATH: C:\cygwin64\bin;
TOOLSET: gcc

View File

@ -73,10 +73,10 @@ BOOST_NORETURN BOOST_NOINLINE inline void throw_exception_from_error( std::excep
// in_place_*
using in_place_value_t = variant2::in_place_index_t<0>;
constexpr in_place_value_t in_place_value{};
BOOST_INLINE_CONSTEXPR in_place_value_t in_place_value{};
using in_place_error_t = variant2::in_place_index_t<1>;
constexpr in_place_error_t in_place_error{};
BOOST_INLINE_CONSTEXPR in_place_error_t in_place_error{};
namespace detail
{
@ -1124,7 +1124,8 @@ result<T, E>& operator|=( result<T, E>& r, F&& f )
template<class T, class E, class F,
class U = decltype( std::declval<F>()( std::declval<T const&>() ) ),
class En = typename std::enable_if<!detail::is_result<U>::value>::type
class En1 = typename std::enable_if<!detail::is_result<U>::value>::type,
class En2 = typename std::enable_if<!std::is_void<U>::value>::type
>
result<U, E> operator&( result<T, E> const& r, F&& f )
{
@ -1140,7 +1141,8 @@ result<U, E> operator&( result<T, E> const& r, F&& f )
template<class T, class E, class F,
class U = decltype( std::declval<F>()( std::declval<T>() ) ),
class En = typename std::enable_if<!detail::is_result<U>::value>::type
class En1 = typename std::enable_if<!detail::is_result<U>::value>::type,
class En2 = typename std::enable_if<!std::is_void<U>::value>::type
>
result<U, E> operator&( result<T, E>&& r, F&& f )
{
@ -1154,9 +1156,44 @@ result<U, E> operator&( result<T, E>&& r, F&& f )
}
}
template<class T, class E, class F,
class U = decltype( std::declval<F>()( std::declval<T const&>() ) ),
class En = typename std::enable_if<std::is_void<U>::value>::type
>
result<U, E> operator&( result<T, E> const& r, F&& f )
{
if( r.has_error() )
{
return r.error();
}
else
{
std::forward<F>( f )( *r );
return {};
}
}
template<class T, class E, class F,
class U = decltype( std::declval<F>()( std::declval<T>() ) ),
class En = typename std::enable_if<std::is_void<U>::value>::type
>
result<U, E> operator&( result<T, E>&& r, F&& f )
{
if( r.has_error() )
{
return r.error();
}
else
{
std::forward<F>( f )( *std::move( r ) );
return {};
}
}
template<class E, class F,
class U = decltype( std::declval<F>()() ),
class En = typename std::enable_if<!detail::is_result<U>::value>::type
class En1 = typename std::enable_if<!detail::is_result<U>::value>::type,
class En2 = typename std::enable_if<!std::is_void<U>::value>::type
>
result<U, E> operator&( result<void, E> const& r, F&& f )
{
@ -1170,6 +1207,23 @@ result<U, E> operator&( result<void, E> const& r, F&& f )
}
}
template<class E, class F,
class U = decltype( std::declval<F>()() ),
class En = typename std::enable_if<std::is_void<U>::value>::type
>
result<U, E> operator&( result<void, E> const& r, F&& f )
{
if( r.has_error() )
{
return r.error();
}
else
{
std::forward<F>( f )();
return {};
}
}
// result & unary-returning-result
template<class T, class E, class F,
@ -1242,6 +1296,20 @@ result<T, E>& operator&=( result<T, E>& r, F&& f )
return r;
}
template<class E, class F,
class U = decltype( std::declval<F>()() ),
class En = typename std::enable_if<!detail::is_result<U>::value>::type
>
result<void, E>& operator&=( result<void, E>& r, F&& f )
{
if( r )
{
std::forward<F>( f )();
}
return r;
}
// result &= unary-returning-result
template<class T, class E, class F,

View File

@ -59,6 +59,13 @@ int& h( int& )
return x;
}
static int fv_called;
void fv()
{
++fv_called;
}
int main()
{
{
@ -110,5 +117,25 @@ int main()
BOOST_TEST( r.has_error() );
}
{
result<void> r;
fv_called = 0;
r &= fv;
BOOST_TEST( r.has_value() );
BOOST_TEST_EQ( fv_called, 1 );
}
{
result<void, E> r( in_place_error );
fv_called = 0;
r &= fv;
BOOST_TEST( r.has_error() );
BOOST_TEST_EQ( fv_called, 0 );
}
return boost::report_errors();
}

View File

@ -55,6 +55,20 @@ int k()
return 7;
}
static int fv1_called_with;
void fv1( int x )
{
fv1_called_with = x;
}
static int fv2_called;
void fv2()
{
++fv2_called;
}
int main()
{
{
@ -199,5 +213,119 @@ int main()
BOOST_TEST( r2.has_error() );
}
{
fv1_called_with = 0;
result<int> r( 1 );
result<void> r2 = r & fv1;
BOOST_TEST( r2.has_value() );
BOOST_TEST_EQ( fv1_called_with, 1 );
}
{
result<int> const r( 1 );
result<void> r2 = r & fv1;
BOOST_TEST( r2.has_value() );
BOOST_TEST_EQ( fv1_called_with, 1 );
}
{
fv1_called_with = 0;
result<void> r2 = result<int>( 1 ) & fv1;
BOOST_TEST( r2.has_value() );
BOOST_TEST_EQ( fv1_called_with, 1 );
}
{
fv1_called_with = 0;
result<int, E> r( in_place_error );
result<void, E> r2 = r & fv1;
BOOST_TEST( r2.has_error() );
BOOST_TEST_EQ( fv1_called_with, 0 );
}
{
fv1_called_with = 0;
result<int, E> const r( in_place_error );
result<void, E> r2 = r & fv1;
BOOST_TEST( r2.has_error() );
BOOST_TEST_EQ( fv1_called_with, 0 );
}
{
fv1_called_with = 0;
result<void, E> r2 = result<int, E>( in_place_error ) & fv1;
BOOST_TEST( r2.has_error() );
BOOST_TEST_EQ( fv1_called_with, 0 );
}
{
result<void> r;
fv2_called = 0;
result<void> r2 = r & fv2;
BOOST_TEST( r2.has_value() );
BOOST_TEST_EQ( fv2_called, 1 );
}
{
result<void> const r;
fv2_called = 0;
result<void> r2 = r & fv2;
BOOST_TEST( r2.has_value() );
BOOST_TEST_EQ( fv2_called, 1 );
}
{
fv2_called = 0;
result<void> r2 = result<void>() & fv2;
BOOST_TEST( r2.has_value() );
BOOST_TEST_EQ( fv2_called, 1 );
}
{
result<void, E> r( in_place_error );
fv2_called = 0;
result<void, E> r2 = r & fv2;
BOOST_TEST( r2.has_error() );
BOOST_TEST_EQ( fv2_called, 0 );
}
{
result<void, E> const r( in_place_error );
fv2_called = 0;
result<void, E> r2 = r & fv2;
BOOST_TEST( r2.has_error() );
BOOST_TEST_EQ( fv2_called, 0 );
}
{
fv2_called = 0;
result<void, E> r2 = result<void, E>( in_place_error ) & fv2;
BOOST_TEST( r2.has_error() );
BOOST_TEST_EQ( fv2_called, 0 );
}
return boost::report_errors();
}