Fix for Issue 53

Author: zajo

include/boost/leaf/handle_errors.hpp

@@ -733,7 +733,7 @@ try_handle_some( TryBlock && try_block, H && ... h ) noexcept
         using R = typename std::decay<decltype(std::declval<TryBlock>()())>::type;
         auto rr = ctx.template handle_error<R>(id, std::forward<H>(h)..., [&r]()->R { return std::move(r); });
         if( !rr )
-            ctx.propagate(id);
+            ctx.propagate(rr.error());
         return rr;
     }
 }
@@ -869,7 +869,7 @@ try_handle_some( TryBlock && try_block, H && ... h )
         using R = typename std::decay<decltype(std::declval<TryBlock>()())>::type;
         auto rr = ctx.template handle_error<R>(id, std::forward<H>(h)..., [&r]()->R { return std::move(r); });
         if( !rr )
-            ctx.propagate(id);
+            ctx.propagate(rr.error());
         return rr;
     }
 }

meson.build

@@ -143,6 +143,8 @@ if option_enable_unit_tests
         'exception_test',
         'exception_to_result_test',
         'function_traits_test',
+        'github_issue53_test',
+        'github_issue53x_test',
         'handle_all_other_result_test',
         'handle_all_test',
         'handle_basic_test',

test/Jamfile.v2

@@ -82,6 +82,8 @@ run error_id_test.cpp ;
 run exception_test.cpp ;
 run exception_to_result_test.cpp ;
 run function_traits_test.cpp ;
+run github_issue53_test.cpp ;
+run github_issue53x_test.cpp ;
 run handle_all_other_result_test.cpp ;
 run handle_all_test.cpp ;
 run handle_basic_test.cpp ;

test/github_issue53_test.cpp

@@ -0,0 +1,77 @@
+// Copyright 2018-2022 Emil Dotchevski and Reverge Studios, Inc.
+
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+#ifdef BOOST_LEAF_TEST_SINGLE_HEADER
+#   include "leaf.hpp"
+#else
+#   include <boost/leaf/handle_errors.hpp>
+#   include <boost/leaf/result.hpp>
+#   include <boost/leaf/pred.hpp>
+#endif
+
+#include "lightweight_test.hpp"
+
+namespace leaf = boost::leaf;
+
+enum class ErrorCode
+{
+    E_GENERIC_UNEXPECTED,
+    E_GENERIC_PARSE
+};
+
+leaf::result<int> test1( int a )
+{
+    if( a == 1 )
+        return leaf::new_error(ErrorCode::E_GENERIC_UNEXPECTED);
+    return 32;
+}
+
+leaf::result<float> test2(int a)
+{
+    return leaf::try_handle_some(
+        [&]() -> leaf::result<float>
+        {
+            BOOST_LEAF_AUTO(val, test1(a));
+            (void) val;
+            return 4.5;
+        },
+        [](leaf::match<ErrorCode,ErrorCode::E_GENERIC_UNEXPECTED>) -> leaf::result<float>
+        {
+            return leaf::new_error(ErrorCode::E_GENERIC_PARSE);
+        }
+    );
+}
+
+void test3(int a)
+{
+    int x = 0;
+    leaf::try_handle_all(
+        [&]() -> leaf::result<void>
+        {
+            BOOST_LEAF_AUTO(val, test2(a));
+            (void) val;
+            return {};
+        },
+        [&](leaf::match<ErrorCode, ErrorCode::E_GENERIC_PARSE>)
+        {
+            x = 1;
+        },
+        [&](ErrorCode e)
+        {
+            x = 2;
+        },
+        [&]()
+        {
+            x = 3;
+        }
+    );
+    BOOST_TEST_EQ(x, 1);
+}
+
+int main()
+{
+    test3(1);
+    return boost::report_errors();
+}

test/github_issue53x_test.cpp

@@ -0,0 +1,93 @@
+// Copyright 2018-2022 Emil Dotchevski and Reverge Studios, Inc.
+
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+
+#include <boost/leaf/config.hpp>
+
+#ifdef BOOST_LEAF_NO_EXCEPTIONS
+
+#include <iostream>
+
+int main()
+{
+    std::cout << "Unit test not applicable." << std::endl;
+    return 0;
+}
+
+#else
+
+#ifdef BOOST_LEAF_TEST_SINGLE_HEADER
+#   include "leaf.hpp"
+#else
+#   include <boost/leaf/handle_errors.hpp>
+#   include <boost/leaf/pred.hpp>
+#endif
+
+#include "lightweight_test.hpp"
+
+namespace leaf = boost::leaf;
+
+enum class ErrorCode
+{
+    E_GENERIC_UNEXPECTED,
+    E_GENERIC_PARSE
+};
+
+int test1( int a )
+{
+    if( a == 1 )
+        BOOST_LEAF_THROW_EXCEPTION(ErrorCode::E_GENERIC_UNEXPECTED);
+    return 32;
+}
+
+float test2(int a)
+{
+    return leaf::try_catch(
+        [&]
+        {
+            auto val = test1(a);
+            (void) val;
+            return 4.5;
+        },
+        [](leaf::match<ErrorCode,ErrorCode::E_GENERIC_UNEXPECTED>)
+        {
+            BOOST_LEAF_THROW_EXCEPTION(ErrorCode::E_GENERIC_PARSE);
+            return 0;
+        }
+    );
+}
+
+void test3(int a)
+{
+    int x = 0;
+    leaf::try_catch(
+        [&]
+        {
+            auto val = test2(a);
+            (void) val;
+        },
+        [&](leaf::match<ErrorCode, ErrorCode::E_GENERIC_PARSE>)
+        {
+            x = 1;
+        },
+        [&](ErrorCode e)
+        {
+            x = 2;
+        },
+        [&]()
+        {
+            x = 3;
+        }
+    );
+    BOOST_TEST_EQ(x, 1);
+}
+
+int main()
+{
+    test3(1);
+    return boost::report_errors();
+}
+
+#endif