diff --git a/include/boost/compat/invoke.hpp b/include/boost/compat/invoke.hpp index e262f4c..aa63728 100644 --- a/include/boost/compat/invoke.hpp +++ b/include/boost/compat/invoke.hpp @@ -61,6 +61,24 @@ template struct is_nothrow_invocable: conditional_t< is_inv #endif +// invoke_r + +template::value && is_invocable::value>> +constexpr R invoke_r( F&& f, A&&... a ) + noexcept( is_nothrow_invocable::value ) +{ + compat::invoke( std::forward(f), std::forward(a)... ); +} + +template::value && std::is_convertible< invoke_result_t, R >::value >> +constexpr R invoke_r( F&& f, A&&... a ) + noexcept( noexcept( static_cast( compat::invoke( std::forward(f), std::forward(a)... ) ) ) ) +{ + return compat::invoke( std::forward(f), std::forward(a)... ); +} + } // namespace compat } // namespace boost diff --git a/test/Jamfile b/test/Jamfile index 30aef6d..9808923 100644 --- a/test/Jamfile +++ b/test/Jamfile @@ -74,3 +74,8 @@ compile bind_back_fn_constexpr_test.cpp ; compile bind_back_obj_constexpr_test.cpp ; compile bind_back_mfn_constexpr_test.cpp ; compile bind_back_md_constexpr_test.cpp ; + +run invoke_r_fn_test.cpp ; +run invoke_r_obj_test.cpp ; +run invoke_r_mfn_test.cpp ; +run invoke_r_md_test.cpp ; diff --git a/test/invoke_r_fn_test.cpp b/test/invoke_r_fn_test.cpp new file mode 100644 index 0000000..83e0b8d --- /dev/null +++ b/test/invoke_r_fn_test.cpp @@ -0,0 +1,45 @@ +// Copyright 2024 Peter Dimov +// Distributed under the Boost Software License, Version 1.0. +// https://www.boost.org/LICENSE_1_0.txt + +#if defined(__GNUC__) && __GNUC__ == 7 +# pragma GCC diagnostic ignored "-Wnoexcept-type" +#endif + +#include +#include + +int f0() +{ + return -1; +} + +int f1( int x1 ) noexcept +{ + return x1; +} + +int f2( int x1, int x2 ) +{ + return 10*x1+x2; +} + +int f3( int x1, int x2, int x3 ) noexcept +{ + return 100*x1 + 10*x2 + x3; +} + +int main() +{ + BOOST_TEST_EQ( boost::compat::invoke_r( f0 ), -1 ); + BOOST_TEST_EQ( boost::compat::invoke_r( f1, 1 ), 1 ); + BOOST_TEST_EQ( boost::compat::invoke_r( f2, 1, 2 ), 12 ); + BOOST_TEST_EQ( boost::compat::invoke_r( f3, 1, 2, 3 ), 123 ); + + boost::compat::invoke_r( f0 ); + boost::compat::invoke_r( f1, 1 ); + boost::compat::invoke_r( f2, 1, 2 ); + boost::compat::invoke_r( f3, 1, 2, 3 ); + + return boost::report_errors(); +} diff --git a/test/invoke_r_md_test.cpp b/test/invoke_r_md_test.cpp new file mode 100644 index 0000000..8da3111 --- /dev/null +++ b/test/invoke_r_md_test.cpp @@ -0,0 +1,131 @@ +// Copyright 2024 Peter Dimov +// Distributed under the Boost Software License, Version 1.0. +// https://www.boost.org/LICENSE_1_0.txt + +#include +#include +#include + +struct X +{ + int m = -1; +}; + +struct Y: public virtual X +{ +}; + +int main() +{ + { + BOOST_TEST_EQ( boost::compat::invoke_r( &X::m, X() ), -1 ); + } + + { + BOOST_TEST_EQ( boost::compat::invoke_r( &X::m, Y() ), -1 ); + } + + { + X x; + + BOOST_TEST_EQ( boost::compat::invoke_r( &X::m, x ), -1 ); + boost::compat::invoke_r( &X::m, x ) = +1; + BOOST_TEST_EQ( boost::compat::invoke_r( &X::m, x ), +1 ); + boost::compat::invoke_r( &X::m, x ); + } + + { + X x; + + BOOST_TEST_EQ( boost::compat::invoke_r( &X::m, &x ), -1 ); + boost::compat::invoke_r( &X::m, &x ) = +1; + BOOST_TEST_EQ( boost::compat::invoke_r( &X::m, &x ), +1 ); + boost::compat::invoke_r( &X::m, &x ); + } + + { + X x; + + BOOST_TEST_EQ( boost::compat::invoke_r( &X::m, std::ref(x) ), -1 ); + boost::compat::invoke_r( &X::m, std::ref(x) ) = +1; + BOOST_TEST_EQ( boost::compat::invoke_r( &X::m, std::ref(x) ), +1 ); + boost::compat::invoke_r( &X::m, std::ref(x) ); + } + + { + X x; + + BOOST_TEST_EQ( boost::compat::invoke_r( &X::m, std::cref(x) ), -1 ); + BOOST_TEST_EQ( boost::compat::invoke_r( &X::m, std::cref(x) ), -1 ); + boost::compat::invoke_r( &X::m, std::cref(x) ); + } + + { + Y y; + + BOOST_TEST_EQ( boost::compat::invoke_r( &X::m, y ), -1 ); + boost::compat::invoke_r( &X::m, y ) = +1; + BOOST_TEST_EQ( boost::compat::invoke_r( &X::m, y ), +1 ); + boost::compat::invoke_r( &X::m, y ); + } + + { + Y y; + + BOOST_TEST_EQ( boost::compat::invoke_r( &X::m, &y ), -1 ); + boost::compat::invoke_r( &X::m, &y ) = +1; + BOOST_TEST_EQ( boost::compat::invoke_r( &X::m, &y ), +1 ); + boost::compat::invoke_r( &X::m, &y ); + } + + { + Y y; + + BOOST_TEST_EQ( boost::compat::invoke_r( &X::m, std::ref(y) ), -1 ); + boost::compat::invoke_r( &X::m, std::ref(y) ) = +1; + BOOST_TEST_EQ( boost::compat::invoke_r( &X::m, std::ref(y) ), +1 ); + boost::compat::invoke_r( &X::m, std::ref(y) ); + } + + { + Y y; + + BOOST_TEST_EQ( boost::compat::invoke_r( &X::m, std::cref(y) ), -1 ); + BOOST_TEST_EQ( boost::compat::invoke_r( &X::m, std::cref(y) ), -1 ); + boost::compat::invoke_r( &X::m, std::cref(y) ); + } + + { + X const x = {}; + + BOOST_TEST_EQ( boost::compat::invoke_r( &X::m, x ), -1 ); + BOOST_TEST_EQ( boost::compat::invoke_r( &X::m, x ), -1 ); + boost::compat::invoke_r( &X::m, x ); + + BOOST_TEST_EQ( boost::compat::invoke_r( &X::m, &x ), -1 ); + BOOST_TEST_EQ( boost::compat::invoke_r( &X::m, &x ), -1 ); + boost::compat::invoke_r( &X::m, &x ); + + BOOST_TEST_EQ( boost::compat::invoke_r( &X::m, std::ref(x) ), -1 ); + BOOST_TEST_EQ( boost::compat::invoke_r( &X::m, std::ref(x) ), -1 ); + boost::compat::invoke_r( &X::m, std::ref(x) ); + } + + { + Y const y = {}; + + BOOST_TEST_EQ( boost::compat::invoke_r( &X::m, y ), -1 ); + BOOST_TEST_EQ( boost::compat::invoke_r( &X::m, y ), -1 ); + boost::compat::invoke_r( &X::m, y ); + + BOOST_TEST_EQ( boost::compat::invoke_r( &X::m, &y ), -1 ); + BOOST_TEST_EQ( boost::compat::invoke_r( &X::m, &y ), -1 ); + boost::compat::invoke_r( &X::m, &y ); + + BOOST_TEST_EQ( boost::compat::invoke_r( &X::m, std::ref(y) ), -1 ); + BOOST_TEST_EQ( boost::compat::invoke_r( &X::m, std::ref(y) ), -1 ); + boost::compat::invoke_r( &X::m, std::ref(y) ); + } + + return boost::report_errors(); +} diff --git a/test/invoke_r_mfn_test.cpp b/test/invoke_r_mfn_test.cpp new file mode 100644 index 0000000..c0e0fda --- /dev/null +++ b/test/invoke_r_mfn_test.cpp @@ -0,0 +1,211 @@ +// Copyright 2024 Peter Dimov +// Distributed under the Boost Software License, Version 1.0. +// https://www.boost.org/LICENSE_1_0.txt + +#if defined(__GNUC__) && __GNUC__ == 7 +# pragma GCC diagnostic ignored "-Wnoexcept-type" +#endif + +#include +#include +#include + +struct X +{ + int f0() + { + return -1; + } + + int f1( int x1 ) noexcept + { + return x1; + } + + int f2( int x1, int x2 ) const + { + return 10*x1+x2; + } + + int f3( int x1, int x2, int x3 ) const noexcept + { + return 100*x1 + 10*x2 + x3; + } +}; + +struct Y: public virtual X +{ +}; + +int main() +{ + { + BOOST_TEST_EQ( boost::compat::invoke_r( &X::f0, X() ), -1 ); + BOOST_TEST_EQ( boost::compat::invoke_r( &X::f1, X(), 1 ), 1 ); + BOOST_TEST_EQ( boost::compat::invoke_r( &X::f2, X(), 1, 2 ), 12 ); + BOOST_TEST_EQ( boost::compat::invoke_r( &X::f3, X(), 1, 2, 3 ), 123 ); + } + + { + BOOST_TEST_EQ( boost::compat::invoke_r( &X::f0, Y() ), -1 ); + BOOST_TEST_EQ( boost::compat::invoke_r( &X::f1, Y(), 1 ), 1 ); + BOOST_TEST_EQ( boost::compat::invoke_r( &X::f2, Y(), 1, 2 ), 12 ); + BOOST_TEST_EQ( boost::compat::invoke_r( &X::f3, Y(), 1, 2, 3 ), 123 ); + } + + { + X x; + + BOOST_TEST_EQ( boost::compat::invoke_r( &X::f0, x ), -1 ); + BOOST_TEST_EQ( boost::compat::invoke_r( &X::f1, x, 1 ), 1 ); + BOOST_TEST_EQ( boost::compat::invoke_r( &X::f2, x, 1, 2 ), 12 ); + BOOST_TEST_EQ( boost::compat::invoke_r( &X::f3, x, 1, 2, 3 ), 123 ); + + BOOST_TEST_EQ( boost::compat::invoke_r( &X::f0, &x ), -1 ); + BOOST_TEST_EQ( boost::compat::invoke_r( &X::f1, &x, 1 ), 1 ); + BOOST_TEST_EQ( boost::compat::invoke_r( &X::f2, &x, 1, 2 ), 12 ); + BOOST_TEST_EQ( boost::compat::invoke_r( &X::f3, &x, 1, 2, 3 ), 123 ); + + BOOST_TEST_EQ( boost::compat::invoke_r( &X::f0, std::ref(x) ), -1 ); + BOOST_TEST_EQ( boost::compat::invoke_r( &X::f1, std::ref(x), 1 ), 1 ); + BOOST_TEST_EQ( boost::compat::invoke_r( &X::f2, std::ref(x), 1, 2 ), 12 ); + BOOST_TEST_EQ( boost::compat::invoke_r( &X::f3, std::ref(x), 1, 2, 3 ), 123 ); + + BOOST_TEST_EQ( boost::compat::invoke_r( &X::f2, std::cref(x), 1, 2 ), 12 ); + BOOST_TEST_EQ( boost::compat::invoke_r( &X::f3, std::cref(x), 1, 2, 3 ), 123 ); + } + + { + Y y; + + BOOST_TEST_EQ( boost::compat::invoke_r( &X::f0, y ), -1 ); + BOOST_TEST_EQ( boost::compat::invoke_r( &X::f1, y, 1 ), 1 ); + BOOST_TEST_EQ( boost::compat::invoke_r( &X::f2, y, 1, 2 ), 12 ); + BOOST_TEST_EQ( boost::compat::invoke_r( &X::f3, y, 1, 2, 3 ), 123 ); + + BOOST_TEST_EQ( boost::compat::invoke_r( &X::f0, &y ), -1 ); + BOOST_TEST_EQ( boost::compat::invoke_r( &X::f1, &y, 1 ), 1 ); + BOOST_TEST_EQ( boost::compat::invoke_r( &X::f2, &y, 1, 2 ), 12 ); + BOOST_TEST_EQ( boost::compat::invoke_r( &X::f3, &y, 1, 2, 3 ), 123 ); + + BOOST_TEST_EQ( boost::compat::invoke_r( &X::f0, std::ref(y) ), -1 ); + BOOST_TEST_EQ( boost::compat::invoke_r( &X::f1, std::ref(y), 1 ), 1 ); + BOOST_TEST_EQ( boost::compat::invoke_r( &X::f2, std::ref(y), 1, 2 ), 12 ); + BOOST_TEST_EQ( boost::compat::invoke_r( &X::f3, std::ref(y), 1, 2, 3 ), 123 ); + + BOOST_TEST_EQ( boost::compat::invoke_r( &X::f2, std::cref(y), 1, 2 ), 12 ); + BOOST_TEST_EQ( boost::compat::invoke_r( &X::f3, std::cref(y), 1, 2, 3 ), 123 ); + } + + { + X const x = {}; + + BOOST_TEST_EQ( boost::compat::invoke_r( &X::f2, x, 1, 2 ), 12 ); + BOOST_TEST_EQ( boost::compat::invoke_r( &X::f3, x, 1, 2, 3 ), 123 ); + + BOOST_TEST_EQ( boost::compat::invoke_r( &X::f2, &x, 1, 2 ), 12 ); + BOOST_TEST_EQ( boost::compat::invoke_r( &X::f3, &x, 1, 2, 3 ), 123 ); + + BOOST_TEST_EQ( boost::compat::invoke_r( &X::f2, std::ref(x), 1, 2 ), 12 ); + BOOST_TEST_EQ( boost::compat::invoke_r( &X::f3, std::ref(x), 1, 2, 3 ), 123 ); + } + + { + Y const y = {}; + + BOOST_TEST_EQ( boost::compat::invoke_r( &X::f2, y, 1, 2 ), 12 ); + BOOST_TEST_EQ( boost::compat::invoke_r( &X::f3, y, 1, 2, 3 ), 123 ); + + BOOST_TEST_EQ( boost::compat::invoke_r( &X::f2, &y, 1, 2 ), 12 ); + BOOST_TEST_EQ( boost::compat::invoke_r( &X::f3, &y, 1, 2, 3 ), 123 ); + + BOOST_TEST_EQ( boost::compat::invoke_r( &X::f2, std::ref(y), 1, 2 ), 12 ); + BOOST_TEST_EQ( boost::compat::invoke_r( &X::f3, std::ref(y), 1, 2, 3 ), 123 ); + } + + { + boost::compat::invoke_r( &X::f0, X() ); + boost::compat::invoke_r( &X::f1, X(), 1 ); + boost::compat::invoke_r( &X::f2, X(), 1, 2 ); + boost::compat::invoke_r( &X::f3, X(), 1, 2, 3 ); + } + + { + boost::compat::invoke_r( &X::f0, Y() ); + boost::compat::invoke_r( &X::f1, Y(), 1 ); + boost::compat::invoke_r( &X::f2, Y(), 1, 2 ); + boost::compat::invoke_r( &X::f3, Y(), 1, 2, 3 ); + } + + { + X x; + + boost::compat::invoke_r( &X::f0, x ); + boost::compat::invoke_r( &X::f1, x, 1 ); + boost::compat::invoke_r( &X::f2, x, 1, 2 ); + boost::compat::invoke_r( &X::f3, x, 1, 2, 3 ); + + boost::compat::invoke_r( &X::f0, &x ); + boost::compat::invoke_r( &X::f1, &x, 1 ); + boost::compat::invoke_r( &X::f2, &x, 1, 2 ); + boost::compat::invoke_r( &X::f3, &x, 1, 2, 3 ); + + boost::compat::invoke_r( &X::f0, std::ref(x) ); + boost::compat::invoke_r( &X::f1, std::ref(x), 1 ); + boost::compat::invoke_r( &X::f2, std::ref(x), 1, 2 ); + boost::compat::invoke_r( &X::f3, std::ref(x), 1, 2, 3 ); + + boost::compat::invoke_r( &X::f2, std::cref(x), 1, 2 ); + boost::compat::invoke_r( &X::f3, std::cref(x), 1, 2, 3 ); + } + + { + Y y; + + boost::compat::invoke_r( &X::f0, y ); + boost::compat::invoke_r( &X::f1, y, 1 ); + boost::compat::invoke_r( &X::f2, y, 1, 2 ); + boost::compat::invoke_r( &X::f3, y, 1, 2, 3 ); + + boost::compat::invoke_r( &X::f0, &y ); + boost::compat::invoke_r( &X::f1, &y, 1 ); + boost::compat::invoke_r( &X::f2, &y, 1, 2 ); + boost::compat::invoke_r( &X::f3, &y, 1, 2, 3 ); + + boost::compat::invoke_r( &X::f0, std::ref(y) ); + boost::compat::invoke_r( &X::f1, std::ref(y), 1 ); + boost::compat::invoke_r( &X::f2, std::ref(y), 1, 2 ); + boost::compat::invoke_r( &X::f3, std::ref(y), 1, 2, 3 ); + + boost::compat::invoke_r( &X::f2, std::cref(y), 1, 2 ); + boost::compat::invoke_r( &X::f3, std::cref(y), 1, 2, 3 ); + } + + { + X const x = {}; + + boost::compat::invoke_r( &X::f2, x, 1, 2 ); + boost::compat::invoke_r( &X::f3, x, 1, 2, 3 ); + + boost::compat::invoke_r( &X::f2, &x, 1, 2 ); + boost::compat::invoke_r( &X::f3, &x, 1, 2, 3 ); + + boost::compat::invoke_r( &X::f2, std::ref(x), 1, 2 ); + boost::compat::invoke_r( &X::f3, std::ref(x), 1, 2, 3 ); + } + + { + Y const y = {}; + + boost::compat::invoke_r( &X::f2, y, 1, 2 ); + boost::compat::invoke_r( &X::f3, y, 1, 2, 3 ); + + boost::compat::invoke_r( &X::f2, &y, 1, 2 ); + boost::compat::invoke_r( &X::f3, &y, 1, 2, 3 ); + + boost::compat::invoke_r( &X::f2, std::ref(y), 1, 2 ); + boost::compat::invoke_r( &X::f3, std::ref(y), 1, 2, 3 ); + } + + return boost::report_errors(); +} diff --git a/test/invoke_r_obj_test.cpp b/test/invoke_r_obj_test.cpp new file mode 100644 index 0000000..938e81a --- /dev/null +++ b/test/invoke_r_obj_test.cpp @@ -0,0 +1,80 @@ +// Copyright 2024 Peter Dimov +// Distributed under the Boost Software License, Version 1.0. +// https://www.boost.org/LICENSE_1_0.txt + +#include +#include + +struct F +{ + int operator()() + { + return -1; + } + + int operator()( int x1 ) noexcept + { + return x1; + } + + int operator()( int x1, int x2 ) const + { + return 10*x1+x2; + } + + int operator()( int x1, int x2, int x3 ) const noexcept + { + return 100*x1 + 10*x2 + x3; + } +}; + +int main() +{ + { + BOOST_TEST_EQ( boost::compat::invoke_r( F() ), -1 ); + BOOST_TEST_EQ( boost::compat::invoke_r( F(), 1 ), 1 ); + BOOST_TEST_EQ( boost::compat::invoke_r( F(), 1, 2 ), 12 ); + BOOST_TEST_EQ( boost::compat::invoke_r( F(), 1, 2, 3 ), 123 ); + } + + { + F f; + + BOOST_TEST_EQ( boost::compat::invoke_r( f ), -1 ); + BOOST_TEST_EQ( boost::compat::invoke_r( f, 1 ), 1 ); + BOOST_TEST_EQ( boost::compat::invoke_r( f, 1, 2 ), 12 ); + BOOST_TEST_EQ( boost::compat::invoke_r( f, 1, 2, 3 ), 123 ); + } + + { + F const f = {}; + + BOOST_TEST_EQ( boost::compat::invoke_r( f, 1, 2 ), 12 ); + BOOST_TEST_EQ( boost::compat::invoke_r( f, 1, 2, 3 ), 123 ); + } + + { + boost::compat::invoke_r( F() ); + boost::compat::invoke_r( F(), 1 ); + boost::compat::invoke_r( F(), 1, 2 ); + boost::compat::invoke_r( F(), 1, 2, 3 ); + } + + { + F f; + + boost::compat::invoke_r( f ); + boost::compat::invoke_r( f, 1 ); + boost::compat::invoke_r( f, 1, 2 ); + boost::compat::invoke_r( f, 1, 2, 3 ); + } + + { + F const f = {}; + + boost::compat::invoke_r( f, 1, 2 ); + boost::compat::invoke_r( f, 1, 2, 3 ); + } + + return boost::report_errors(); +}