simplified Optional operator&& with requires

arBmind · arBmind · commit 0ece9f590706 · 2020-09-15T18:38:34.000+02:00
* synchronized implementations for PackedOptional and Optional
diff --git a/src/optional19.lib/optional19/Optional.h b/src/optional19.lib/optional19/Optional.h
@@ -127,12 +127,8 @@ struct Optional
     constexpr explicit operator bool() const { return this->m_valid; }
 
     /// @return predicate(value()) if optional is set else return false
-    template<class F> constexpr auto operator&&(F&& f) const -> bool {
-        if constexpr (std::is_invocable_r_v<bool, F, T>)
-            return this->m_valid && f(value());
-        else {
-            return this->m_valid && f;
-        }
+    template<class F> requires(std::is_invocable_r_v<bool, F, T>) constexpr auto operator&&(F&& f) const -> bool {
+        return static_cast<bool>(*this) && f(value());
     }
 
     template<class F> constexpr auto operator||(F&& f) const -> T {
diff --git a/src/optional19.lib/optional19/PackedOptional.h b/src/optional19.lib/optional19/PackedOptional.h
@@ -25,12 +25,8 @@ template<auto makeInvalid, auto isValid = notEqualBy<makeInvalid>> struct Packed
     constexpr explicit operator bool() const { return isValid(m_data); }
 
     /// @return predicate(value()) if optional is set else return false
-    template<class F> constexpr auto operator&&(F&& f) const -> bool {
-        if constexpr (std::is_invocable_r_v<bool, F, T>)
-            return *this ? f(value()) : false;
-        else {
-            return *this ? f : false;
-        }
+    template<class F> requires(std::is_invocable_r_v<bool, F, T>) constexpr auto operator&&(F&& f) const -> bool {
+        return static_cast<bool>(*this) && f(value());
     }
 
     template<class F> constexpr auto operator||(F&& f) const -> T {
