add support for -fno-exception, calls terminate instead of throwing

matcool · matcool · commit 88fde6b847fc · 2025-02-16T14:33:44.000-03:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.21 FATAL_ERROR)
 cmake_policy(SET CMP0097 NEW)
 
-project(GeodeResult VERSION 1.3.3 LANGUAGES C CXX)
+project(GeodeResult VERSION 1.3.4 LANGUAGES C CXX)
 
 add_library(GeodeResult INTERFACE)
 
diff --git a/include/Geode/Result.hpp b/include/Geode/Result.hpp
@@ -2,6 +2,7 @@
 #define GEODE_RESULT_HPP
 
 #include <concepts>
+#include <exception>
 #include <optional>
 #include <sstream>
 #include <stdexcept>
@@ -128,6 +129,17 @@
             (errVariable = std::move(GEODE_CONCAT(res, __LINE__)).unwrapErr(), false)
 #endif
 
+// Internal macros
+
+#if !defined(GEODE_RESULT_IMPL_THROW)
+    #if __cpp_exceptions
+        #define GEODE_RESULT_IMPL_THROW(expr) throw expr
+    #else
+        // used when `-fno-exceptions` is active
+        #define GEODE_RESULT_IMPL_THROW(expr) std::terminate()
+    #endif
+#endif
+
 namespace geode {
     template <class OkType, class ErrType>
     class Result;
@@ -514,7 +526,7 @@ namespace geode {
                     return std::get<0>(std::move(m_data));
                 }
                 else {
-                    throw UnwrapException(ErrTag{}, std::get<1>(m_data));
+                    GEODE_RESULT_IMPL_THROW(UnwrapException(ErrTag{}, std::get<1>(m_data)));
                 }
             }
 
@@ -526,7 +538,7 @@ namespace geode {
                     return std::get<0>(m_data);
                 }
                 else {
-                    throw UnwrapException(ErrTag{}, std::get<1>(m_data));
+                    GEODE_RESULT_IMPL_THROW(UnwrapException(ErrTag{}, std::get<1>(m_data)));
                 }
             }
 
@@ -538,7 +550,7 @@ namespace geode {
                     return std::get<0>(m_data);
                 }
                 else {
-                    throw UnwrapException(ErrTag{}, std::get<1>(m_data));
+                    GEODE_RESULT_IMPL_THROW(UnwrapException(ErrTag{}, std::get<1>(m_data)));
                 }
             }
 
@@ -550,7 +562,7 @@ namespace geode {
                     return std::get<1>(std::move(m_data));
                 }
                 else {
-                    throw UnwrapException(OkTag{}, std::get<0>(m_data));
+                    GEODE_RESULT_IMPL_THROW(UnwrapException(OkTag{}, std::get<0>(m_data)));
                 }
             }
 
@@ -562,7 +574,7 @@ namespace geode {
                     return std::get<1>(m_data);
                 }
                 else {
-                    throw UnwrapException(OkTag{}, std::get<0>(m_data));
+                    GEODE_RESULT_IMPL_THROW(UnwrapException(OkTag{}, std::get<0>(m_data)));
                 }
             }
 
@@ -574,7 +586,7 @@ namespace geode {
                     return std::get<1>(m_data);
                 }
                 else {
-                    throw UnwrapException(OkTag{}, std::get<0>(m_data));
+                    GEODE_RESULT_IMPL_THROW(UnwrapException(OkTag{}, std::get<0>(m_data)));
                 }
             }
 
@@ -769,7 +781,7 @@ namespace geode {
             /// @throw UnwrapException if the Result is Err
             constexpr void unwrap() {
                 if (isErr()) {
-                    throw UnwrapException(ErrTag{}, std::get<1>(m_data));
+                    GEODE_RESULT_IMPL_THROW(UnwrapException(ErrTag{}, std::get<1>(m_data)));
                 }
             }
 
@@ -781,7 +793,7 @@ namespace geode {
                     return std::get<1>(std::move(m_data));
                 }
                 else {
-                    throw UnwrapException(OkTag{}, std::get<0>(m_data));
+                    GEODE_RESULT_IMPL_THROW(UnwrapException(OkTag{}, std::get<0>(m_data)));
                 }
             }
 
@@ -793,7 +805,7 @@ namespace geode {
                     return std::get<1>(m_data);
                 }
                 else {
-                    throw UnwrapException(OkTag{}, std::get<0>(m_data));
+                    GEODE_RESULT_IMPL_THROW(UnwrapException(OkTag{}, std::get<0>(m_data)));
                 }
             }
 
@@ -805,7 +817,7 @@ namespace geode {
                     return std::get<1>(m_data);
                 }
                 else {
-                    throw UnwrapException(OkTag{}, std::get<0>(m_data));
+                    GEODE_RESULT_IMPL_THROW(UnwrapException(OkTag{}, std::get<0>(m_data)));
                 }
             }
 
@@ -905,7 +917,7 @@ namespace geode {
                     return std::get<0>(std::move(m_data));
                 }
                 else {
-                    throw UnwrapException(ErrTag{}, std::get<1>(m_data));
+                    GEODE_RESULT_IMPL_THROW(UnwrapException(ErrTag{}, std::get<1>(m_data)));
                 }
             }
 
@@ -917,7 +929,7 @@ namespace geode {
                     return std::get<0>(m_data);
                 }
                 else {
-                    throw UnwrapException(ErrTag{}, std::get<1>(m_data));
+                    GEODE_RESULT_IMPL_THROW(UnwrapException(ErrTag{}, std::get<1>(m_data)));
                 }
             }
 
@@ -929,7 +941,7 @@ namespace geode {
                     return std::get<0>(m_data);
                 }
                 else {
-                    throw UnwrapException(ErrTag{}, std::get<1>(m_data));
+                    GEODE_RESULT_IMPL_THROW(UnwrapException(ErrTag{}, std::get<1>(m_data)));
                 }
             }
 
@@ -938,7 +950,7 @@ namespace geode {
             /// @return the Err value
             constexpr void unwrapErr() {
                 if (isOk()) {
-                    throw UnwrapException(OkTag{}, std::get<0>(m_data));
+                    GEODE_RESULT_IMPL_THROW(UnwrapException(OkTag{}, std::get<0>(m_data)));
                 }
             }
 
@@ -1093,7 +1105,7 @@ namespace geode {
             /// @throw UnwrapException if the Result is Err
             constexpr void unwrap() {
                 if (isErr()) {
-                    throw UnwrapException(ErrTag{}, std::get<1>(m_data));
+                    GEODE_RESULT_IMPL_THROW(UnwrapException(ErrTag{}, std::get<1>(m_data)));
                 }
             }
 
@@ -1102,7 +1114,7 @@ namespace geode {
             /// @return the Err value
             constexpr void unwrapErr() {
                 if (isOk()) {
-                    throw UnwrapException(OkTag{}, std::get<0>(m_data));
+                    GEODE_RESULT_IMPL_THROW(UnwrapException(OkTag{}, std::get<0>(m_data)));
                 }
             }
 

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`#define GEODE_RESULT_HPP`
`3`	`3`
`4`	`4`	`#include <concepts>`
	`5`	`+#include <exception>`
`5`	`6`	`#include <optional>`
`6`	`7`	`#include <sstream>`
`7`	`8`	`#include <stdexcept>`
`@@ -128,6 +129,17 @@`
`128`	`129`	`(errVariable = std::move(GEODE_CONCAT(res, __LINE__)).unwrapErr(), false)`
`129`	`130`	`#endif`
`130`	`131`
	`132`	`+// Internal macros`
	`133`	`+`
	`134`	`+#if !defined(GEODE_RESULT_IMPL_THROW)`
	`135`	`+ #if __cpp_exceptions`
	`136`	`+ #define GEODE_RESULT_IMPL_THROW(expr) throw expr`
	`137`	`+ #else`
	`138`	+ // used when `-fno-exceptions` is active
	`139`	`+ #define GEODE_RESULT_IMPL_THROW(expr) std::terminate()`
	`140`	`+ #endif`
	`141`	`+#endif`
	`142`	`+`
`131`	`143`	`namespace geode {`
`132`	`144`	`template <class OkType, class ErrType>`
`133`	`145`	`class Result;`
`@@ -514,7 +526,7 @@ namespace geode {`
`514`	`526`	`return std::get<0>(std::move(m_data));`
`515`	`527`	`}`
`516`	`528`	`else {`
`517`		`- throw UnwrapException(ErrTag{}, std::get<1>(m_data));`
	`529`	`+ GEODE_RESULT_IMPL_THROW(UnwrapException(ErrTag{}, std::get<1>(m_data)));`
`518`	`530`	`}`
`519`	`531`	`}`
`520`	`532`
`@@ -526,7 +538,7 @@ namespace geode {`
`526`	`538`	`return std::get<0>(m_data);`
`527`	`539`	`}`
`528`	`540`	`else {`
`529`		`- throw UnwrapException(ErrTag{}, std::get<1>(m_data));`
	`541`	`+ GEODE_RESULT_IMPL_THROW(UnwrapException(ErrTag{}, std::get<1>(m_data)));`
`530`	`542`	`}`
`531`	`543`	`}`
`532`	`544`
`@@ -538,7 +550,7 @@ namespace geode {`
`538`	`550`	`return std::get<0>(m_data);`
`539`	`551`	`}`
`540`	`552`	`else {`
`541`		`- throw UnwrapException(ErrTag{}, std::get<1>(m_data));`
	`553`	`+ GEODE_RESULT_IMPL_THROW(UnwrapException(ErrTag{}, std::get<1>(m_data)));`
`542`	`554`	`}`
`543`	`555`	`}`
`544`	`556`
`@@ -550,7 +562,7 @@ namespace geode {`
`550`	`562`	`return std::get<1>(std::move(m_data));`
`551`	`563`	`}`
`552`	`564`	`else {`
`553`		`- throw UnwrapException(OkTag{}, std::get<0>(m_data));`
	`565`	`+ GEODE_RESULT_IMPL_THROW(UnwrapException(OkTag{}, std::get<0>(m_data)));`
`554`	`566`	`}`
`555`	`567`	`}`
`556`	`568`
`@@ -562,7 +574,7 @@ namespace geode {`
`562`	`574`	`return std::get<1>(m_data);`
`563`	`575`	`}`
`564`	`576`	`else {`
`565`		`- throw UnwrapException(OkTag{}, std::get<0>(m_data));`
	`577`	`+ GEODE_RESULT_IMPL_THROW(UnwrapException(OkTag{}, std::get<0>(m_data)));`
`566`	`578`	`}`
`567`	`579`	`}`
`568`	`580`
`@@ -574,7 +586,7 @@ namespace geode {`
`574`	`586`	`return std::get<1>(m_data);`
`575`	`587`	`}`
`576`	`588`	`else {`
`577`		`- throw UnwrapException(OkTag{}, std::get<0>(m_data));`
	`589`	`+ GEODE_RESULT_IMPL_THROW(UnwrapException(OkTag{}, std::get<0>(m_data)));`
`578`	`590`	`}`
`579`	`591`	`}`
`580`	`592`
`@@ -769,7 +781,7 @@ namespace geode {`
`769`	`781`	`/// @throw UnwrapException if the Result is Err`
`770`	`782`	`constexpr void unwrap() {`
`771`	`783`	`if (isErr()) {`
`772`		`- throw UnwrapException(ErrTag{}, std::get<1>(m_data));`
	`784`	`+ GEODE_RESULT_IMPL_THROW(UnwrapException(ErrTag{}, std::get<1>(m_data)));`
`773`	`785`	`}`
`774`	`786`	`}`
`775`	`787`
`@@ -781,7 +793,7 @@ namespace geode {`
`781`	`793`	`return std::get<1>(std::move(m_data));`
`782`	`794`	`}`
`783`	`795`	`else {`
`784`		`- throw UnwrapException(OkTag{}, std::get<0>(m_data));`
	`796`	`+ GEODE_RESULT_IMPL_THROW(UnwrapException(OkTag{}, std::get<0>(m_data)));`
`785`	`797`	`}`
`786`	`798`	`}`
`787`	`799`
`@@ -793,7 +805,7 @@ namespace geode {`
`793`	`805`	`return std::get<1>(m_data);`
`794`	`806`	`}`
`795`	`807`	`else {`
`796`		`- throw UnwrapException(OkTag{}, std::get<0>(m_data));`
	`808`	`+ GEODE_RESULT_IMPL_THROW(UnwrapException(OkTag{}, std::get<0>(m_data)));`
`797`	`809`	`}`
`798`	`810`	`}`
`799`	`811`
`@@ -805,7 +817,7 @@ namespace geode {`
`805`	`817`	`return std::get<1>(m_data);`
`806`	`818`	`}`
`807`	`819`	`else {`
`808`		`- throw UnwrapException(OkTag{}, std::get<0>(m_data));`
	`820`	`+ GEODE_RESULT_IMPL_THROW(UnwrapException(OkTag{}, std::get<0>(m_data)));`
`809`	`821`	`}`
`810`	`822`	`}`
`811`	`823`
`@@ -905,7 +917,7 @@ namespace geode {`
`905`	`917`	`return std::get<0>(std::move(m_data));`
`906`	`918`	`}`
`907`	`919`	`else {`
`908`		`- throw UnwrapException(ErrTag{}, std::get<1>(m_data));`
	`920`	`+ GEODE_RESULT_IMPL_THROW(UnwrapException(ErrTag{}, std::get<1>(m_data)));`
`909`	`921`	`}`
`910`	`922`	`}`
`911`	`923`
`@@ -917,7 +929,7 @@ namespace geode {`
`917`	`929`	`return std::get<0>(m_data);`
`918`	`930`	`}`
`919`	`931`	`else {`
`920`		`- throw UnwrapException(ErrTag{}, std::get<1>(m_data));`
	`932`	`+ GEODE_RESULT_IMPL_THROW(UnwrapException(ErrTag{}, std::get<1>(m_data)));`
`921`	`933`	`}`
`922`	`934`	`}`
`923`	`935`
`@@ -929,7 +941,7 @@ namespace geode {`
`929`	`941`	`return std::get<0>(m_data);`
`930`	`942`	`}`
`931`	`943`	`else {`
`932`		`- throw UnwrapException(ErrTag{}, std::get<1>(m_data));`
	`944`	`+ GEODE_RESULT_IMPL_THROW(UnwrapException(ErrTag{}, std::get<1>(m_data)));`
`933`	`945`	`}`
`934`	`946`	`}`
`935`	`947`
`@@ -938,7 +950,7 @@ namespace geode {`
`938`	`950`	`/// @return the Err value`
`939`	`951`	`constexpr void unwrapErr() {`
`940`	`952`	`if (isOk()) {`
`941`		`- throw UnwrapException(OkTag{}, std::get<0>(m_data));`
	`953`	`+ GEODE_RESULT_IMPL_THROW(UnwrapException(OkTag{}, std::get<0>(m_data)));`
`942`	`954`	`}`
`943`	`955`	`}`
`944`	`956`
`@@ -1093,7 +1105,7 @@ namespace geode {`
`1093`	`1105`	`/// @throw UnwrapException if the Result is Err`
`1094`	`1106`	`constexpr void unwrap() {`
`1095`	`1107`	`if (isErr()) {`
`1096`		`- throw UnwrapException(ErrTag{}, std::get<1>(m_data));`
	`1108`	`+ GEODE_RESULT_IMPL_THROW(UnwrapException(ErrTag{}, std::get<1>(m_data)));`
`1097`	`1109`	`}`
`1098`	`1110`	`}`
`1099`	`1111`
`@@ -1102,7 +1114,7 @@ namespace geode {`
`1102`	`1114`	`/// @return the Err value`
`1103`	`1115`	`constexpr void unwrapErr() {`
`1104`	`1116`	`if (isOk()) {`
`1105`		`- throw UnwrapException(OkTag{}, std::get<0>(m_data));`
	`1117`	`+ GEODE_RESULT_IMPL_THROW(UnwrapException(OkTag{}, std::get<0>(m_data)));`
`1106`	`1118`	`}`
`1107`	`1119`	`}`
`1108`	`1120`