Merge branch 'develop'

boostorg · Aug 19, 2024 · 7d17e6f · 7d17e6f
2 parents cf0dcfc + 0e7f5a0
commit 7d17e6f
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 5 deletions.
diff --git a/include/boost/leaf/detail/optional.hpp b/include/boost/leaf/detail/optional.hpp
@@ -185,6 +185,14 @@ namespace leaf_detail
             reset();
             return tmp;
         }
+
+        BOOST_LEAF_CONSTEXPR T & value_or_default(int key) noexcept
+        {
+            if( T * v = has_value(key) )
+                return *v;
+            else
+                return load(key);
+        }
     };
 
 }

diff --git a/include/boost/leaf/error.hpp b/include/boost/leaf/error.hpp
@@ -150,6 +150,7 @@ namespace leaf_detail
         using impl::load;
         using impl::has_value;
         using impl::value;
+        using impl::value_or_default;
     };
 }
 

diff --git a/include/boost/leaf/handle_errors.hpp b/include/boost/leaf/handle_errors.hpp
@@ -977,21 +977,21 @@ namespace leaf_detail
                 {
                     sl.deactivate();
                     int const err_id = error_id(r.error()).value();
-                    return leaf_result(sl.value(err_id).template extract_capture_list<leaf_result>(err_id));
+                    return leaf_result(sl.value_or_default(err_id).template extract_capture_list<leaf_result>(err_id));
                 }
             }
 #ifndef BOOST_LEAF_NO_EXCEPTIONS
             catch( std::exception & ex )
             {
                 sl.deactivate();
                 int const err_id = error_info(&ex).error().value();
-                return sl.value(err_id).template extract_capture_list<leaf_result>(err_id);
+                return sl.value_or_default(err_id).template extract_capture_list<leaf_result>(err_id);
             }
             catch(...)
             {
                 sl.deactivate();
                 int const err_id = error_info(nullptr).error().value();
-                return sl.value(err_id).template extract_capture_list<leaf_result>(err_id);
+                return sl.value_or_default(err_id).template extract_capture_list<leaf_result>(err_id);
             }
 #endif
         }
@@ -1037,13 +1037,13 @@ namespace leaf_detail
             {
                 sl.deactivate();
                 int const err_id = error_info(&ex).error().value();
-                return sl.value(err_id).template extract_capture_list<leaf_result>(err_id);
+                return sl.value_or_default(err_id).template extract_capture_list<leaf_result>(err_id);
             }
             catch(...)
             {
                 sl.deactivate();
                 int const err_id = error_info(nullptr).error().value();
-                return sl.value(err_id).template extract_capture_list<leaf_result>(err_id);
+                return sl.value_or_default(err_id).template extract_capture_list<leaf_result>(err_id);
             }
 #endif
         }

diff --git a/test/try_capture_all_test.cpp b/test/try_capture_all_test.cpp
@@ -68,6 +68,25 @@ namespace
 
 int main()
 {
+    {
+        leaf::result<void> r = leaf::try_capture_all([]() { throw std::runtime_error("x"); });
+        BOOST_TEST(!r);
+        int r1 = leaf::try_handle_all(
+            [&]() -> leaf::result<int>
+            {
+                BOOST_LEAF_CHECK(r);
+                return 0;
+            },
+            [](std::runtime_error const &)
+            {
+                return 1;
+            },
+            []
+            {
+                return 2;
+            } );
+        BOOST_TEST_EQ(r1, 1);
+    }
     {
         leaf::result<void> r = leaf::try_capture_all(
             []() -> leaf::result<void>