From f808ed2438b565efee15b47a20acebd33d9ea277 Mon Sep 17 00:00:00 2001
From: Alexander McCord <alex@mccord.dev>
Date: Sun, 26 May 2024 22:18:25 -0700
Subject: [PATCH] Inline DERIVE_EQ and DERIVE_HASH.

---
 EqSat/include/Luau/Language.h | 60 ++++++++++++++++++++---------------
 1 file changed, 34 insertions(+), 26 deletions(-)

diff --git a/EqSat/include/Luau/Language.h b/EqSat/include/Luau/Language.h
index edbed9af..5247ebab 100644
--- a/EqSat/include/Luau/Language.h
+++ b/EqSat/include/Luau/Language.h
@@ -56,32 +56,28 @@ inline size_t hashCombine(size_t& seed, size_t hash)
         using Base::Node; \
     }
 
-#define DERIVE_EQ(name, field) \
-    bool operator==(const name& rhs) const \
-    { \
-        return field == rhs.field; \
-    } \
-    bool operator!=(const name& rhs) const \
-    { \
-        return !(*this == rhs); \
-    }
-
-#define DERIVE_HASH(name, field) \
-    struct Hash \
-    { \
-        size_t operator()(const name& value) const \
-        { \
-            return languageHash(value.field); \
-        } \
-    }
-
 template<typename Phantom, typename T>
 struct Atom
 {
     T value;
 
-    DERIVE_EQ(Atom, value);
-    DERIVE_HASH(Atom, value);
+    bool operator==(const Atom& rhs) const
+    {
+        return value == rhs.value;
+    }
+
+    bool operator!=(const Atom& rhs) const
+    {
+        return !(*this == rhs);
+    }
+
+    struct Hash
+    {
+        size_t operator()(const Atom& value) const
+        {
+            return languageHash(value.value);
+        }
+    };
 };
 
 /// Empty base class just for static_asserts.
@@ -132,12 +128,24 @@ public:
         return array[getIndex<T>()];
     }
 
-    DERIVE_EQ(Node, array);
-    DERIVE_HASH(Node, array);
-};
+    bool operator==(const Node& rhs) const
+    {
+        return array == rhs.array;
+    }
 
-#undef DERIVE_EQ
-#undef DERIVE_HASH
+    bool operator!=(const Node& rhs) const
+    {
+        return !(*this == rhs);
+    }
+
+    struct Hash
+    {
+        size_t operator()(const Node& value) const
+        {
+            return languageHash(value.array);
+        }
+    };
+};
 
 // `Language` is very similar to `Luau::Variant` with enough differences warranting a different type altogether.
 //