Improved on_error testis, fixed a minor noexcept issue

Author: zajo

include/boost/leaf/error.hpp

@@ -611,15 +611,14 @@ namespace detail
         return int(id);
     }
 
-    inline int start_new_error()
+    inline int start_new_error() noexcept(!BOOST_LEAF_CFG_CAPTURE)
     {
-        int id = new_id();
 #if BOOST_LEAF_CFG_CAPTURE
         if( dynamic_allocator * da = get_dynamic_allocator() )
             for( preloaded_base const * e = da->preloaded_list(); e; e = e->next_ )
                 e->reserve(*da);
 #endif
-        return id;
+        return new_id();
     }
 
     struct inject_loc

include/boost/leaf/on_error.hpp

@@ -40,7 +40,19 @@ class error_monitor
 #   else
             if( std::uncaught_exception() )
 #   endif
+#   if BOOST_LEAF_CFG_CAPTURE
+                try
+                {
+                    return detail::start_new_error();
+                }
+                catch(...)
+                {
+                    BOOST_LEAF_ASSERT(detail::current_id() == err_id_);
+                    return detail::new_id();
+                }
+#   else
                 return detail::start_new_error();
+#   endif
 #endif
             return 0;
         }

test/on_error_alloc_fail_test.cpp

@@ -10,6 +10,7 @@
 #   include <boost/leaf/handle_errors.hpp>
 #   include <boost/leaf/result.hpp>
 #   include <boost/leaf/diagnostics.hpp>
+#   include <boost/leaf/exception.hpp>
 #endif
 
 #if !BOOST_LEAF_CFG_CAPTURE || defined(BOOST_LEAF_NO_EXCEPTIONS)
@@ -22,6 +23,7 @@ int main()
 #else
 
 #include <sstream>
+#include <stdexcept>
 #include <string>
 
 namespace leaf = boost::leaf;
@@ -119,6 +121,118 @@ int main()
     }
 #endif
 
+////////////////////////////////////////
+
+    {
+        auto captured = leaf::try_capture_all(
+            []() -> leaf::result<void>
+            {
+                auto load = leaf::on_error( other_info<1>{1}, alloc_fail_info{42}, other_info<2>{2} );
+                throw std::runtime_error("test");
+            } );
+
+        int r = leaf::try_handle_all(
+            [&]() -> leaf::result<int>
+            {
+                (void) captured.value();
+                return 0;
+            },
+            []( other_info<1> const & oi1, other_info<2> const * oi2, alloc_fail_info const * afi )
+            {
+                BOOST_TEST_EQ(oi1.value, 1);
+                BOOST_TEST_EQ(oi2, nullptr);
+                BOOST_TEST_EQ(afi, nullptr);
+                return 1;
+            },
+            []
+            {
+                return 2;
+            } );
+        BOOST_TEST_EQ(r, 1);
+    }
+
+#if BOOST_LEAF_CFG_DIAGNOSTICS && BOOST_LEAF_CFG_STD_STRING
+    {
+        int r = leaf::try_catch(
+            []() -> int
+            {
+                auto load = leaf::on_error( other_info<1>{1}, alloc_fail_info{42}, other_info<2>{2} );
+                throw std::runtime_error("test");
+            },
+            []( leaf::diagnostic_details const & dd )
+            {
+                std::ostringstream s;
+                s << dd;
+                std::string str = s.str();
+                BOOST_TEST(str.find("other_info<1>") != std::string::npos);
+                BOOST_TEST(str.find("other_info<2>") == std::string::npos);
+                BOOST_TEST(str.find("alloc_fail_info") == std::string::npos);
+                return 1;
+            },
+            []
+            {
+                return 2;
+            } );
+        BOOST_TEST_EQ(r, 1);
+    }
+#endif
+
+////////////////////////////////////////
+
+    {
+        auto captured = leaf::try_capture_all(
+            []() -> leaf::result<void>
+            {
+                auto load = leaf::on_error( other_info<1>{1}, alloc_fail_info{42}, other_info<2>{2} );
+                leaf::throw_exception(std::runtime_error("test"));
+            } );
+
+        int r = leaf::try_handle_all(
+            [&]() -> leaf::result<int>
+            {
+                (void) captured.value();
+                return 0;
+            },
+            []( std::bad_alloc const &, other_info<1> const & oi1, other_info<2> const * oi2, alloc_fail_info const * afi )
+            {
+                BOOST_TEST_EQ(oi1.value, 1);
+                BOOST_TEST_EQ(oi2, nullptr);
+                BOOST_TEST_EQ(afi, nullptr);
+                return 1;
+            },
+            []
+            {
+                return 2;
+            } );
+        BOOST_TEST_EQ(r, 1);
+    }
+
+#if BOOST_LEAF_CFG_DIAGNOSTICS && BOOST_LEAF_CFG_STD_STRING
+    {
+        int r = leaf::try_catch(
+            []() -> int
+            {
+                auto load = leaf::on_error( other_info<1>{1}, alloc_fail_info{42}, other_info<2>{2} );
+                leaf::throw_exception(std::runtime_error("test"));
+            },
+            []( std::bad_alloc const &, leaf::diagnostic_details const & dd )
+            {
+                std::ostringstream s;
+                s << dd;
+                std::string str = s.str();
+                BOOST_TEST(str.find("other_info<1>") != std::string::npos);
+                BOOST_TEST(str.find("other_info<2>") == std::string::npos);
+                BOOST_TEST(str.find("alloc_fail_info") == std::string::npos);
+                return 1;
+            },
+            []
+            {
+                return 2;
+            } );
+        BOOST_TEST_EQ(r, 1);
+    }
+#endif
+
     return boost::report_errors();
 }