Add invoke_r

boostorg · Apr 6, 2024 · 984d6b3 · 984d6b3
1 parent 87e758f
commit 984d6b3
Show file tree

Hide file tree

Showing 6 changed files with 490 additions and 0 deletions.
diff --git a/include/boost/compat/invoke.hpp b/include/boost/compat/invoke.hpp
@@ -61,6 +61,24 @@ template<class F, class... A> struct is_nothrow_invocable: conditional_t< is_inv
 
 #endif
 
+// invoke_r
+
+template<class R, class F, class... A, class En = enable_if_t<
+    std::is_void<R>::value && is_invocable<F, A...>::value>>
+constexpr R invoke_r( F&& f, A&&... a )
+    noexcept( is_nothrow_invocable<F, A...>::value )
+{
+    compat::invoke( std::forward<F>(f), std::forward<A>(a)... );
+}
+
+template<class R, class F, class... A, class = void, class En = enable_if_t<
+    !std::is_void<R>::value && std::is_convertible< invoke_result_t<F, A...>, R >::value >>
+constexpr R invoke_r( F&& f, A&&... a )
+    noexcept( noexcept( static_cast<R>( compat::invoke( std::forward<F>(f), std::forward<A>(a)... ) ) ) )
+{
+    return compat::invoke( std::forward<F>(f), std::forward<A>(a)... );
+}
+
 } // namespace compat
 } // namespace boost
 

diff --git 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
@@ -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 <boost/compat/invoke.hpp>
+#include <boost/core/lightweight_test.hpp>
+
+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<long>( f0 ), -1 );
+    BOOST_TEST_EQ( boost::compat::invoke_r<long>( f1, 1 ), 1 );
+    BOOST_TEST_EQ( boost::compat::invoke_r<long>( f2, 1, 2 ), 12 );
+    BOOST_TEST_EQ( boost::compat::invoke_r<long>( f3, 1, 2, 3 ), 123 );
+
+    boost::compat::invoke_r<void>( f0 );
+    boost::compat::invoke_r<void>( f1, 1 );
+    boost::compat::invoke_r<void>( f2, 1, 2 );
+    boost::compat::invoke_r<void>( f3, 1, 2, 3 );
+
+    return boost::report_errors();
+}
diff --git a/test/invoke_r_md_test.cpp 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 <boost/compat/invoke.hpp>
+#include <boost/core/lightweight_test.hpp>
+#include <functional>
+
+struct X
+{
+    int m = -1;
+};
+
+struct Y: public virtual X
+{
+};
+
+int main()
+{
+    {
+        BOOST_TEST_EQ( boost::compat::invoke_r<long>( &X::m, X() ), -1 );
+    }
+
+    {
+        BOOST_TEST_EQ( boost::compat::invoke_r<long>( &X::m, Y() ), -1 );
+    }
+
+    {
+        X x;
+
+        BOOST_TEST_EQ( boost::compat::invoke_r<int const&>( &X::m, x ), -1 );
+        boost::compat::invoke_r<int&>( &X::m, x ) = +1;
+        BOOST_TEST_EQ( boost::compat::invoke_r<long>( &X::m, x ), +1 );
+        boost::compat::invoke_r<void>( &X::m, x );
+    }
+
+    {
+        X x;
+
+        BOOST_TEST_EQ( boost::compat::invoke_r<int const&>( &X::m, &x ), -1 );
+        boost::compat::invoke_r<int&>( &X::m, &x ) = +1;
+        BOOST_TEST_EQ( boost::compat::invoke_r<long>( &X::m, &x ), +1 );
+        boost::compat::invoke_r<void>( &X::m, &x );
+    }
+
+    {
+        X x;
+
+        BOOST_TEST_EQ( boost::compat::invoke_r<int const&>( &X::m, std::ref(x) ), -1 );
+        boost::compat::invoke_r<int&>( &X::m, std::ref(x) ) = +1;
+        BOOST_TEST_EQ( boost::compat::invoke_r<long>( &X::m, std::ref(x) ), +1 );
+        boost::compat::invoke_r<void>( &X::m, std::ref(x) );
+    }
+
+    {
+        X x;
+
+        BOOST_TEST_EQ( boost::compat::invoke_r<int const&>( &X::m, std::cref(x) ), -1 );
+        BOOST_TEST_EQ( boost::compat::invoke_r<long>( &X::m, std::cref(x) ), -1 );
+        boost::compat::invoke_r<void>( &X::m, std::cref(x) );
+    }
+
+    {
+        Y y;
+
+        BOOST_TEST_EQ( boost::compat::invoke_r<int const&>( &X::m, y ), -1 );
+        boost::compat::invoke_r<int&>( &X::m, y ) = +1;
+        BOOST_TEST_EQ( boost::compat::invoke_r<long>( &X::m, y ), +1 );
+        boost::compat::invoke_r<void>( &X::m, y );
+    }
+
+    {
+        Y y;
+
+        BOOST_TEST_EQ( boost::compat::invoke_r<int const&>( &X::m, &y ), -1 );
+        boost::compat::invoke_r<int&>( &X::m, &y ) = +1;
+        BOOST_TEST_EQ( boost::compat::invoke_r<long>( &X::m, &y ), +1 );
+        boost::compat::invoke_r<void>( &X::m, &y );
+    }
+
+    {
+        Y y;
+
+        BOOST_TEST_EQ( boost::compat::invoke_r<int const&>( &X::m, std::ref(y) ), -1 );
+        boost::compat::invoke_r<int&>( &X::m, std::ref(y) ) = +1;
+        BOOST_TEST_EQ( boost::compat::invoke_r<long>( &X::m, std::ref(y) ), +1 );
+        boost::compat::invoke_r<void>( &X::m, std::ref(y) );
+    }
+
+    {
+        Y y;
+
+        BOOST_TEST_EQ( boost::compat::invoke_r<int const&>( &X::m, std::cref(y) ), -1 );
+        BOOST_TEST_EQ( boost::compat::invoke_r<long>( &X::m, std::cref(y) ), -1 );
+        boost::compat::invoke_r<void>( &X::m, std::cref(y) );
+    }
+
+    {
+        X const x = {};
+
+        BOOST_TEST_EQ( boost::compat::invoke_r<int const&>( &X::m, x ), -1 );
+        BOOST_TEST_EQ( boost::compat::invoke_r<long>( &X::m, x ), -1 );
+        boost::compat::invoke_r<void>( &X::m, x );
+
+        BOOST_TEST_EQ( boost::compat::invoke_r<int const&>( &X::m, &x ), -1 );
+        BOOST_TEST_EQ( boost::compat::invoke_r<long>( &X::m, &x ), -1 );
+        boost::compat::invoke_r<void>( &X::m, &x );
+
+        BOOST_TEST_EQ( boost::compat::invoke_r<int const&>( &X::m, std::ref(x) ), -1 );
+        BOOST_TEST_EQ( boost::compat::invoke_r<long>( &X::m, std::ref(x) ), -1 );
+        boost::compat::invoke_r<void>( &X::m, std::ref(x) );
+    }
+
+    {
+        Y const y = {};
+
+        BOOST_TEST_EQ( boost::compat::invoke_r<int const&>( &X::m, y ), -1 );
+        BOOST_TEST_EQ( boost::compat::invoke_r<long>( &X::m, y ), -1 );
+        boost::compat::invoke_r<void>( &X::m, y );
+
+        BOOST_TEST_EQ( boost::compat::invoke_r<int const&>( &X::m, &y ), -1 );
+        BOOST_TEST_EQ( boost::compat::invoke_r<long>( &X::m, &y ), -1 );
+        boost::compat::invoke_r<void>( &X::m, &y );
+
+        BOOST_TEST_EQ( boost::compat::invoke_r<int const&>( &X::m, std::ref(y) ), -1 );
+        BOOST_TEST_EQ( boost::compat::invoke_r<long>( &X::m, std::ref(y) ), -1 );
+        boost::compat::invoke_r<void>( &X::m, std::ref(y) );
+    }
+
+    return boost::report_errors();
+}