[WIP] Don't call object.Equals() from '=='-operators but use Equals i…

…mplementations on the type.
SteveDunn · Aug 13, 2024 · 4fcf784 · 4fcf784
1 parent 88f00f3
commit 4fcf784
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/Vogen/GenerateEqualsMethodsAndOperators.cs b/src/Vogen/GenerateEqualsMethodsAndOperators.cs
@@ -144,11 +144,11 @@ public static string GenerateEqualsOperatorsForPrimitivesIfNeeded(string itemUnd
         if (item.Config.PrimitiveEqualityGeneration.HasFlag(PrimitiveEqualityGeneration.GenerateOperators))
             return $"""
                     
-                            public static global::System.Boolean operator ==({typeName} left, {itemUnderlyingType} right) => Equals(left.Value, right);
-                            public static global::System.Boolean operator !=({typeName} left, {itemUnderlyingType} right) => !Equals(left.Value, right);
+                            public static global::System.Boolean operator ==({typeName} left, {itemUnderlyingType} right) => left.Equals(right);
+                            public static global::System.Boolean operator !=({typeName} left, {itemUnderlyingType} right) => !(left == right);
                     
-                            public static global::System.Boolean operator ==({itemUnderlyingType} left, {typeName} right) => Equals(left, right.Value);
-                            public static global::System.Boolean operator !=({itemUnderlyingType} left, {typeName} right) => !Equals(left, right.Value);
+                            public static global::System.Boolean operator ==({itemUnderlyingType} left, {typeName} right) => right.Equals(left);
+                            public static global::System.Boolean operator !=({itemUnderlyingType} left, {typeName} right) => !(left == right);
                     """;
 
         return string.Empty;

diff --git a/src/Vogen/Generators/StructGenerator.cs b/src/Vogen/Generators/StructGenerator.cs
@@ -101,7 +101,7 @@ public readonly {itemUnderlyingType} Value
         }}
         {GenerateEqualsMethodsAndOperators.GenerateEqualsMethodsForAStruct(item, tds)}
 
-        public static global::System.Boolean operator ==({structName} left, {structName} right) => Equals(left, right);
+        public static global::System.Boolean operator ==({structName} left, {structName} right) => left.Equals(right);
         public static global::System.Boolean operator !=({structName} left, {structName} right) => !(left == right);
 {GenerateEqualsMethodsAndOperators.GenerateEqualsOperatorsForPrimitivesIfNeeded(itemUnderlyingType, structName, item)}