From afd8e711ab35e8d21bc9c8397f31dcf7ecdec2e3 Mon Sep 17 00:00:00 2001
From: Steven Le Rouzic <steven.lerouzic@gmail.com>
Date: Sat, 2 Nov 2024 18:25:11 +0100
Subject: Add value_or on option

---
 asl/option.hpp             | 14 ++++++++++++++
 asl/tests/option_tests.cpp |  9 +++++++++
 2 files changed, 23 insertions(+)

(limited to 'asl')

diff --git a/asl/option.hpp b/asl/option.hpp
index 2651a00..bb266ab 100644
--- a/asl/option.hpp
+++ b/asl/option.hpp
@@ -373,6 +373,20 @@ public:
             return m_payload.as_init_unsafe();
         }
     }
+
+    template<typename U>
+    constexpr T value_or(U&& other_value) const&
+        requires copy_constructible<T> && convertible<U&&, T>
+    {
+        return has_value() ? value() : static_cast<T>(ASL_FWD(other_value));
+    }
+
+    template<typename U>
+    constexpr T value_or(U&& other_value) &&
+        requires move_constructible<T> && convertible<U&&, T>
+    {
+        return has_value() ? ASL_MOVE(value()) : static_cast<T>(ASL_FWD(other_value));
+    }
 };
 
 template<typename T>
diff --git a/asl/tests/option_tests.cpp b/asl/tests/option_tests.cpp
index dea046e..ec6e957 100644
--- a/asl/tests/option_tests.cpp
+++ b/asl/tests/option_tests.cpp
@@ -189,3 +189,12 @@ ASL_TEST(convert_move)
     ASL_TEST_EXPECT(opt16.has_value());
     ASL_TEST_EXPECT(opt16.value() == 10);
 }
+
+ASL_TEST(value_or)
+{
+    asl::option<int> a = asl::nullopt;
+    asl::option<int> b = 2;
+
+    ASL_TEST_EXPECT(a.value_or(5) == 5);
+    ASL_TEST_EXPECT(b.value_or(5) == 2);
+}
-- 
cgit