diff --git a/include/boost/system/result.hpp b/include/boost/system/result.hpp index f3d9cbd..4db8cde 100644 --- a/include/boost/system/result.hpp +++ b/include/boost/system/result.hpp @@ -100,6 +100,9 @@ public: using value_type = T; using error_type = E; + static constexpr in_place_value_t in_place_value{}; + static constexpr in_place_error_t in_place_error{}; + public: // constructors @@ -454,6 +457,9 @@ public: using value_type = void; using error_type = E; + static constexpr in_place_value_t in_place_value{}; + static constexpr in_place_error_t in_place_error{}; + public: // constructors diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index de8c636..eeab9c4 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -150,3 +150,5 @@ boost_test(TYPE run SOURCES result_value_construct2.cpp) boost_test(TYPE run SOURCES result_error_construct2.cpp) boost_test(TYPE run SOURCES result_convert_construct.cpp) boost_test(TYPE run SOURCES result_typedefs.cpp) +boost_test(TYPE run SOURCES result_value_construct3.cpp) +boost_test(TYPE run SOURCES result_error_construct3.cpp) diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index ce82929..7a8d185 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -181,3 +181,5 @@ run result_error_construct2.cpp : : : $(CPP11) ; run result_errc_construct.cpp : : : $(CPP11) ; run result_convert_construct.cpp : : : $(CPP11) ; run result_typedefs.cpp : : : $(CPP11) ; +run result_value_construct3.cpp : : : $(CPP11) ; +run result_error_construct3.cpp : : : $(CPP11) ; diff --git a/test/result_error_construct3.cpp b/test/result_error_construct3.cpp new file mode 100644 index 0000000..162ca5b --- /dev/null +++ b/test/result_error_construct3.cpp @@ -0,0 +1,161 @@ +// Copyright 2017, 2021, 2022 Peter Dimov. +// Distributed under the Boost Software License, Version 1.0. +// https://www.boost.org/LICENSE_1_0.txt + +#include +#include +#include +#include + +using namespace boost::system; + +struct X +{ + static int instances; + + int v_; + + X(): v_() { ++instances; } + + explicit X( int v ): v_( v ) { ++instances; } + + X( int v1, int v2 ): v_( v1+v2 ) { ++instances; } + X( int v1, int v2, int v3 ): v_( v1+v2+v3 ) { ++instances; } + + X( X const& r ): v_( r.v_ ) { ++instances; } + + X& operator=( X const& ) = delete; + + ~X() { --instances; } +}; + +int X::instances = 0; + +int main() +{ + { + auto ec = make_error_code( errc::invalid_argument ); + + using R = result; + R r( R::in_place_error, ec ); + + BOOST_TEST( !r.has_value() ); + BOOST_TEST( r.has_error() ); + + BOOST_TEST_EQ( r.error(), ec ); + } + + { + using R = result; + R r( R::in_place_error, EINVAL, generic_category() ); + + BOOST_TEST( !r.has_value() ); + BOOST_TEST( r.has_error() ); + + BOOST_TEST_EQ( r.error(), error_code( EINVAL, generic_category() ) ); + } + + { + auto ec = make_error_code( errc::invalid_argument ); + + using R = result; + R r( R::in_place_error, ec ); + + BOOST_TEST( !r.has_value() ); + BOOST_TEST( r.has_error() ); + + BOOST_TEST_EQ( r.error(), ec ); + } + + { + using R = result; + R r( R::in_place_error, EINVAL, generic_category() ); + + BOOST_TEST( !r.has_value() ); + BOOST_TEST( r.has_error() ); + + BOOST_TEST_EQ( r.error(), error_code( EINVAL, generic_category() ) ); + } + + BOOST_TEST_EQ( X::instances, 0 ); + + { + using R = result; + R r( R::in_place_error, 1 ); + + BOOST_TEST( !r.has_value() ); + BOOST_TEST( r.has_error() ); + + BOOST_TEST_EQ( r.error().v_, 1 ); + + BOOST_TEST_EQ( X::instances, 1 ); + } + + BOOST_TEST_EQ( X::instances, 0 ); + + { + using R = result; + R r( R::in_place_error, 1, 2 ); + + BOOST_TEST( !r.has_value() ); + BOOST_TEST( r.has_error() ); + + BOOST_TEST_EQ( r.error().v_, 1+2 ); + + BOOST_TEST_EQ( X::instances, 1 ); + } + + BOOST_TEST_EQ( X::instances, 0 ); + + { + using R = result; + R r( R::in_place_error, 1, 2, 3 ); + + BOOST_TEST( !r.has_value() ); + BOOST_TEST( r.has_error() ); + + BOOST_TEST_EQ( r.error().v_, 1+2+3 ); + + BOOST_TEST_EQ( X::instances, 1 ); + } + + BOOST_TEST_EQ( X::instances, 0 ); + + { + using R = result; + R r( R::in_place_error, 1 ); + + BOOST_TEST( !r.has_value() ); + BOOST_TEST( r.has_error() ); + + BOOST_TEST_EQ( r.error().v_, 1 ); + + BOOST_TEST_EQ( X::instances, 1 ); + } + + BOOST_TEST_EQ( X::instances, 0 ); + + { + auto ec = make_error_code( errc::invalid_argument ); + + using R = result; + R r( R::in_place_error, ec ); + + BOOST_TEST( !r.has_value() ); + BOOST_TEST( r.has_error() ); + + BOOST_TEST_EQ( r.error(), ec ); + } + + { + using R = result; + R r( R::in_place_error, EINVAL, generic_category() ); + + BOOST_TEST( !r.has_value() ); + BOOST_TEST( r.has_error() ); + + BOOST_TEST_EQ( r.error(), error_code( EINVAL, generic_category() ) ); + } + + return boost::report_errors(); +} diff --git a/test/result_value_construct3.cpp b/test/result_value_construct3.cpp new file mode 100644 index 0000000..040a592 --- /dev/null +++ b/test/result_value_construct3.cpp @@ -0,0 +1,118 @@ +// Copyright 2017, 2021, 2022 Peter Dimov. +// Distributed under the Boost Software License, Version 1.0. +// https://www.boost.org/LICENSE_1_0.txt + +#include +#include + +using namespace boost::system; + +struct X +{ + static int instances; + + int v_; + + explicit X( int v ): v_( v ) { ++instances; } + + X( int v1, int v2 ): v_( v1+v2 ) { ++instances; } + X( int v1, int v2, int v3 ): v_( v1+v2+v3 ) { ++instances; } + + X( X const& ) = delete; + X& operator=( X const& ) = delete; + + ~X() { --instances; } +}; + +int X::instances = 0; + +int main() +{ + { + using R = result; + R r( R::in_place_value, 0 ); + + BOOST_TEST( r.has_value() ); + BOOST_TEST( !r.has_error() ); + + BOOST_TEST_EQ( r.value(), 0 ); + } + + { + using R = result; + R r( R::in_place_value, 1 ); + + BOOST_TEST( r.has_value() ); + BOOST_TEST( !r.has_error() ); + + BOOST_TEST_EQ( *r, 1 ); + } + + BOOST_TEST_EQ( X::instances, 0 ); + + { + using R = result; + R r( R::in_place_value, 1 ); + + BOOST_TEST( r.has_value() ); + BOOST_TEST( !r.has_error() ); + + BOOST_TEST_EQ( r.value().v_, 1 ); + + BOOST_TEST_EQ( X::instances, 1 ); + } + + BOOST_TEST_EQ( X::instances, 0 ); + + { + using R = result; + R r( R::in_place_value, 1, 2 ); + + BOOST_TEST( r.has_value() ); + BOOST_TEST( !r.has_error() ); + + BOOST_TEST_EQ( r.value().v_, 1+2 ); + + BOOST_TEST_EQ( X::instances, 1 ); + } + + BOOST_TEST_EQ( X::instances, 0 ); + + { + using R = result; + R r( R::in_place_value, 1, 2, 3 ); + + BOOST_TEST( r.has_value() ); + BOOST_TEST( !r.has_error() ); + + BOOST_TEST_EQ( r.value().v_, 1+2+3 ); + + BOOST_TEST_EQ( X::instances, 1 ); + } + + BOOST_TEST_EQ( X::instances, 0 ); + + { + using R = result; + R r( R::in_place_value, 1 ); + + BOOST_TEST( r.has_value() ); + BOOST_TEST( !r.has_error() ); + + BOOST_TEST_EQ( r->v_, 1 ); + + BOOST_TEST_EQ( X::instances, 1 ); + } + + BOOST_TEST_EQ( X::instances, 0 ); + + { + using R = result; + R r( R::in_place_value ); + + BOOST_TEST( r.has_value() ); + BOOST_TEST( !r.has_error() ); + } + + return boost::report_errors(); +}