Interoperability with boost::system::result

boostorg · Sep 18, 2024 · a242ee1 · a242ee1
1 parent 10dfe3c
commit a242ee1
Show file tree

Hide file tree

Showing 24 changed files with 478 additions and 251 deletions.
diff --git a/doc/leaf.adoc b/doc/leaf.adoc
@@ -1365,7 +1365,7 @@ return leaf::try_catch(
 [.text-right]
 <<try_catch>> | <<result>>
 
-NOTE: Follow this link to see a complete example program: https://github.com/boostorg/leaf/blob/master/example/try_capture_all_eh.cpp?ts=4[try_capture_all_eh.cpp].
+NOTE: Follow this link to see a complete example program: https://github.com/boostorg/leaf/blob/master/example/try_capture_all_exceptions.cpp?ts=4[try_capture_all_exceptions.cpp].
 
 '''
 
@@ -1776,7 +1776,7 @@ int main() noexcept
 
 NOTE: Follow this link to see the complete program: https://github.com/boostorg/leaf/blob/master/example/lua_callback_result.cpp?ts=4[lua_callback_result.cpp].
 
-TIP: When using Lua with {CPP}, we need to protect the Lua interpreter from exceptions that may be thrown from {CPP} functions installed as `lua_CFunction` callbacks. Here is the program from this section rewritten to use a {CPP} exception (instead of `leaf::result`) to safely communicate errors out of the `do_work` function: https://github.com/boostorg/leaf/blob/master/example/lua_callback_eh.cpp?ts=4[lua_callback_eh.cpp].
+TIP: When using Lua with {CPP}, we need to protect the Lua interpreter from exceptions that may be thrown from {CPP} functions installed as `lua_CFunction` callbacks. Here is the program from this section rewritten to use a {CPP} exception (instead of `leaf::result`) to safely communicate errors out of the `do_work` function: https://github.com/boostorg/leaf/blob/master/example/lua_callback_exceptions.cpp?ts=4[lua_callback_exceptions.cpp].
 
 ''''
 

diff --git a/example/error_log.cpp b/example/error_log.cpp
@@ -12,6 +12,27 @@
 // not captured, only printed.
 
 #include <boost/leaf.hpp>
+
+#ifdef BOOST_LEAF_NO_EXCEPTIONS
+
+namespace boost
+{
+    [[noreturn]] void throw_exception( std::exception const & e )
+    {
+        std::terminate();
+    }
+
+    struct source_location;
+    [[noreturn]] void throw_exception( std::exception const & e, boost::source_location const & )
+    {
+        throw_exception(e);
+    }
+}
+
+#endif
+
+////////////////////////////////////////
+
 #include <iostream>
 #include <cstdlib>
 
@@ -125,24 +146,3 @@ int main()
             } );
     return 0;
 }
-
-////////////////////////////////////////
-
-#ifdef BOOST_LEAF_NO_EXCEPTIONS
-
-namespace boost
-{
-    [[noreturn]] void throw_exception( std::exception const & e )
-    {
-        std::cerr << "Terminating due to a C++ exception under BOOST_LEAF_NO_EXCEPTIONS: " << e.what();
-        std::terminate();
-    }
-
-    struct source_location;
-    [[noreturn]] void throw_exception( std::exception const & e, boost::source_location const & )
-    {
-        throw_exception(e);
-    }
-}
-
-#endif
diff --git a/example/error_trace.cpp b/example/error_trace.cpp
@@ -13,6 +13,27 @@
 // recorded in a std::deque, rather than just printed in-place.
 
 #include <boost/leaf.hpp>
+
+#ifdef BOOST_LEAF_NO_EXCEPTIONS
+
+namespace boost
+{
+    [[noreturn]] void throw_exception( std::exception const & e )
+    {
+        std::terminate();
+    }
+
+    struct source_location;
+    [[noreturn]] void throw_exception( std::exception const & e, boost::source_location const & )
+    {
+        throw_exception(e);
+    }
+}
+
+#endif
+
+////////////////////////////////////////
+
 #include <iostream>
 #include <deque>
 #include <cstdlib>
@@ -125,24 +146,3 @@ int main()
             } );
     return 0;
 }
-
-////////////////////////////////////////
-
-#ifdef BOOST_LEAF_NO_EXCEPTIONS
-
-namespace boost
-{
-    [[noreturn]] void throw_exception( std::exception const & e )
-    {
-        std::cerr << "Terminating due to a C++ exception under BOOST_LEAF_NO_EXCEPTIONS: " << e.what();
-        std::terminate();
-    }
-
-    struct source_location;
-    [[noreturn]] void throw_exception( std::exception const & e, boost::source_location const & )
-    {
-        throw_exception(e);
-    }
-}
-
-#endif
diff --git a/example/lua_callback_eh.cpp → example/lua_callback_exceptions.cpp b/example/lua_callback_eh.cpp → example/lua_callback_exceptions.cpp
diff --git a/example/lua_callback_result.cpp b/example/lua_callback_result.cpp
@@ -5,11 +5,32 @@
 // This is a simple program that shows how to report error objects out of a
 // C-callback, converting them to leaf::result<T> as soon as controlreaches C++.
 
+#include <boost/leaf.hpp>
+
+#ifdef BOOST_LEAF_NO_EXCEPTIONS
+
+namespace boost
+{
+    [[noreturn]] void throw_exception( std::exception const & e )
+    {
+        std::terminate();
+    }
+
+    struct source_location;
+    [[noreturn]] void throw_exception( std::exception const & e, boost::source_location const & )
+    {
+        throw_exception(e);
+    }
+}
+
+#endif
+
+////////////////////////////////////////
+
 extern "C" {
     #include "lua.h"
     #include "lauxlib.h"
 }
-#include <boost/leaf.hpp>
 #include <iostream>
 #include <memory>
 #include <stdlib.h>
@@ -153,22 +174,3 @@ int main()
 
     return 0;
 }
-
-#ifdef BOOST_LEAF_NO_EXCEPTIONS
-
-namespace boost
-{
-    [[noreturn]] void throw_exception( std::exception const & e )
-    {
-        std::cerr << "Terminating due to a C++ exception under BOOST_LEAF_NO_EXCEPTIONS: " << e.what();
-        std::terminate();
-    }
-
-    struct source_location;
-    [[noreturn]] void throw_exception( std::exception const & e, boost::source_location const & )
-    {
-        throw_exception(e);
-    }
-}
-
-#endif
diff --git a/example/print_file/print_file_eh.cpp → example/print_file/print_file_exceptions.cpp b/example/print_file/print_file_eh.cpp → example/print_file/print_file_exceptions.cpp
@@ -7,7 +7,7 @@
 
 // It reads a text file in a buffer and prints it to std::cout, using LEAF to
 // handle errors. This version uses exception handling. The version that does
-// not use exception handling is in print_file_result.cpp.
+// not use exception handling is in print_file_leaf_result.cpp.
 
 #include <boost/leaf.hpp>
 #include <iostream>

diff --git a/example/print_file/print_file_result.cpp → ...ple/print_file/print_file_leaf_result.cpp b/example/print_file/print_file_result.cpp → ...ple/print_file/print_file_leaf_result.cpp
@@ -7,9 +7,30 @@
 
 // It reads a text file in a buffer and prints it to std::cout, using LEAF to
 // handle errors. This version does not use exception handling. The version that
-// does use exception handling is in print_file_eh.cpp.
+// does use exception handling is in print_file_exceptions.cpp.
 
 #include <boost/leaf.hpp>
+
+#ifdef BOOST_LEAF_NO_EXCEPTIONS
+
+namespace boost
+{
+    [[noreturn]] void throw_exception( std::exception const & e )
+    {
+        std::terminate();
+    }
+
+    struct source_location;
+    [[noreturn]] void throw_exception( std::exception const & e, boost::source_location const & )
+    {
+        throw_exception(e);
+    }
+}
+
+#endif
+
+////////////////////////////////////////
+
 #include <iostream>
 #include <memory>
 #include <stdio.h>
@@ -202,24 +223,3 @@ result<void> file_read( FILE & f, void * buf, std::size_t size )
 
     return { };
 }
-
-////////////////////////////////////////
-
-#ifdef BOOST_LEAF_NO_EXCEPTIONS
-
-namespace boost
-{
-    [[noreturn]] void throw_exception( std::exception const & e )
-    {
-        std::cerr << "Terminating due to a C++ exception under BOOST_LEAF_NO_EXCEPTIONS: " << e.what();
-        std::terminate();
-    }
-
-    struct source_location;
-    [[noreturn]] void throw_exception( std::exception const & e, boost::source_location const & )
-    {
-        throw_exception(e);
-    }
-}
-
-#endif
diff --git a/example/print_file/print_file_outcome_result.cpp b/example/print_file/print_file_outcome_result.cpp
@@ -9,8 +9,29 @@
 // It reads a text file in a buffer and prints it to std::cout, using LEAF to
 // handle errors. This version does not use exception handling.
 
-#include <boost/outcome/std_result.hpp>
 #include <boost/leaf.hpp>
+
+#ifdef BOOST_LEAF_NO_EXCEPTIONS
+
+namespace boost
+{
+    [[noreturn]] void throw_exception( std::exception const & e )
+    {
+        std::terminate();
+    }
+
+    struct source_location;
+    [[noreturn]] void throw_exception( std::exception const & e, boost::source_location const & )
+    {
+        throw_exception(e);
+    }
+}
+
+#endif
+
+////////////////////////////////////////
+
+#include <boost/outcome/std_result.hpp>
 #include <iostream>
 #include <memory>
 #include <stdio.h>
@@ -210,24 +231,3 @@ result<void> file_read( FILE & f, void * buf, std::size_t size )
 
     return outcome::success();
 }
-
-////////////////////////////////////////
-
-#ifdef BOOST_LEAF_NO_EXCEPTIONS
-
-namespace boost
-{
-    [[noreturn]] void throw_exception( std::exception const & e )
-    {
-        std::cerr << "Terminating due to a C++ exception under BOOST_LEAF_NO_EXCEPTIONS: " << e.what();
-        std::terminate();
-    }
-
-    struct source_location;
-    [[noreturn]] void throw_exception( std::exception const & e, boost::source_location const & )
-    {
-        throw_exception(e);
-    }
-}
-
-#endif