AK: Merge implementations of operator== for Optional

Instead of having a overload of the operator in each specialization of Optional, use a free function as a common implementation.
AtkinsSJ · Jan 3, 2025 · d6abd44 · d6abd44
1 parent a4abb35
commit d6abd44
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 74 deletions.
diff --git a/AK/FlyString.h b/AK/FlyString.h
@@ -155,18 +155,6 @@ class Optional<FlyString> : public OptionalBase<FlyString> {
         return *this;
     }
 
-    template<typename O>
-    ALWAYS_INLINE bool operator==(Optional<O> const& other) const
-    {
-        return has_value() == other.has_value() && (!has_value() || value() == other.value());
-    }
-
-    template<typename O>
-    ALWAYS_INLINE bool operator==(O const& other) const
-    {
-        return has_value() && value() == other;
-    }
-
     void clear()
     {
         m_value = FlyString(nullptr);

diff --git a/AK/Optional.h b/AK/Optional.h
@@ -120,20 +120,6 @@ requires(!IsLvalueReference<Self>) class [[nodiscard]] OptionalBase {
         return TRY(callback());
     }
 
-    template<typename O>
-    ALWAYS_INLINE bool operator==(Optional<O> const& other) const
-    {
-        return static_cast<Self const&>(*this).has_value() == (other).has_value()
-            && (!static_cast<Self const&>(*this).has_value() || static_cast<Self const&>(*this).value() == (other).value());
-    }
-
-    template<typename O>
-    requires(!Detail::IsBaseOf<OptionalBase<T, Self>, O>)
-    ALWAYS_INLINE bool operator==(O const& other) const
-    {
-        return static_cast<Self const&>(*this).has_value() && static_cast<Self const&>(*this).value() == other;
-    }
-
     [[nodiscard]] ALWAYS_INLINE T const& operator*() const { return static_cast<Self const&>(*this).value(); }
     [[nodiscard]] ALWAYS_INLINE T& operator*() { return static_cast<Self&>(*this).value(); }
 
@@ -262,18 +248,6 @@ requires(!IsLvalueReference<T>) class [[nodiscard]] Optional<T> : public Optiona
         return *this;
     }
 
-    template<typename O>
-    ALWAYS_INLINE bool operator==(Optional<O> const& other) const
-    {
-        return has_value() == other.has_value() && (!has_value() || value() == other.value());
-    }
-
-    template<typename O>
-    ALWAYS_INLINE bool operator==(O const& other) const
-    {
-        return has_value() && value() == other;
-    }
-
     ALWAYS_INLINE ~Optional()
     requires(!IsTriviallyDestructible<T> && IsDestructible<T>)
     {
@@ -488,18 +462,6 @@ requires(IsLvalueReference<T>) class [[nodiscard]] Optional<T> {
         return *exchange(m_pointer, nullptr);
     }
 
-    template<typename U>
-    ALWAYS_INLINE bool operator==(Optional<U> const& other) const
-    {
-        return has_value() == other.has_value() && (!has_value() || value() == other.value());
-    }
-
-    template<typename U>
-    ALWAYS_INLINE bool operator==(U const& other) const
-    {
-        return has_value() && value() == other;
-    }
-
     ALWAYS_INLINE AddConstToReferencedType<T> operator*() const { return value(); }
     ALWAYS_INLINE T operator*() { return value(); }
 
@@ -595,6 +557,19 @@ requires(IsLvalueReference<T>) class [[nodiscard]] Optional<T> {
     RemoveReference<T>* m_pointer { nullptr };
 };
 
+template<typename T1, typename T2>
+ALWAYS_INLINE bool operator==(Optional<T1> const& first, Optional<T2> const& second)
+{
+    return first.has_value() == second.has_value()
+        && (!first.has_value() || first.value() == second.value());
+}
+
+template<typename T1, typename T2>
+ALWAYS_INLINE bool operator==(Optional<T1> const& first, T2 const& second)
+{
+    return first.has_value() && first.value() == second;
+}
+
 }
 
 #if USING_AK_GLOBALLY

diff --git a/AK/String.h b/AK/String.h
@@ -283,18 +283,6 @@ class Optional<String> : public OptionalBase<String> {
         return *this;
     }
 
-    template<typename O>
-    ALWAYS_INLINE bool operator==(Optional<O> const& other) const
-    {
-        return has_value() == other.has_value() && (!has_value() || value() == other.value());
-    }
-
-    template<typename O>
-    ALWAYS_INLINE bool operator==(O const& other) const
-    {
-        return has_value() && value() == other;
-    }
-
     void clear()
     {
         m_value = String(nullptr);

diff --git a/Libraries/LibJS/Runtime/Value.h b/Libraries/LibJS/Runtime/Value.h
@@ -593,18 +593,6 @@ class Optional<JS::Value> : public OptionalBase<JS::Value> {
         return *this;
     }
 
-    template<typename O>
-    ALWAYS_INLINE bool operator==(Optional<O> const& other) const
-    {
-        return has_value() == other.has_value() && (!has_value() || value() == other.value());
-    }
-
-    template<typename O>
-    ALWAYS_INLINE bool operator==(O const& other) const
-    {
-        return has_value() && value() == other;
-    }
-
     void clear()
     {
         m_value = {};