add geode unwrap either

geode-sdk · Dec 3, 2024 · 39cc0f9 · 39cc0f9
1 parent 16e30ab
commit 39cc0f9
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 0 deletions.
diff --git a/include/Geode/Result.hpp b/include/Geode/Result.hpp
@@ -7,6 +7,7 @@
     #include <sstream>
     #include <stdexcept>
     #include <string>
+    #include <tuple>
     #include <utility>
     #include <variant>
 
@@ -73,6 +74,18 @@
             else
     #endif
 
+    #if !defined(GEODE_UNWRAP_EITHER)
+        #define GEODE_UNWRAP_EITHER(okVariable, errVariable, ...)                           \
+            auto [okVariable, errVariable, GEODE_CONCAT(res, __LINE__)] = std::make_tuple(  \
+                geode::impl::ResultOkType<decltype(__VA_ARGS__)>{},                         \
+                geode::impl::ResultErrType<decltype(__VA_ARGS__)>{},                        \
+                (__VA_ARGS__)                                                               \
+            );                                                                              \
+            GEODE_CONCAT(res, __LINE__).isOk() &&                                           \
+                    (okVariable = std::move(GEODE_CONCAT(res, __LINE__)).unwrap(), true) || \
+                (errVariable = std::move(GEODE_CONCAT(res, __LINE__)).unwrapErr(), false)
+    #endif
+
 namespace geode {
     template <class OkType, class ErrType>
     class Result;

diff --git a/test/Misc.cpp b/test/Misc.cpp
@@ -238,6 +238,22 @@ TEST_CASE("Misc") {
         REQUIRE(value == 16);
     }
 
+    SECTION("Unwrap Either") {
+        if (GEODE_UNWRAP_EITHER(value, err, divideConstexpr(32, 2))) {
+            REQUIRE(value == 16);
+        }
+        else {
+            FAIL("Expected the block to be executed");
+        }
+
+        if (GEODE_UNWRAP_EITHER(value, err, divideConstexpr(32, 0))) {
+            FAIL("Expected the block to not be executed");
+        }
+        else {
+            REQUIRE(err == -1);
+        }
+    }
+
     SECTION("Operator*") {
         auto res = divideConstRefErrRef(32, 2);
         REQUIRE(res.isOk());