Merge pull request #1050 from gircore/untyped-record-equality

Untyped records: Implement IEquality via pointer comparison
gircore · Apr 24, 2024 · efe0641 · efe0641
2 parents 824a7cc + 09f2d67
commit efe0641
Show file tree

Hide file tree

Showing 6 changed files with 70 additions and 1 deletion.
diff --git a/src/Generation/Generator/Fixer/Record/RecordEqualsMethodCollidesWithGeneratedCode.cs b/src/Generation/Generator/Fixer/Record/RecordEqualsMethodCollidesWithGeneratedCode.cs
@@ -6,7 +6,10 @@ internal class RecordEqualsMethodCollidesWithGeneratedCode : Fixer<GirModel.Reco
 {
     public void Fixup(GirModel.Record record)
     {
-        if (Model.Record.IsTyped(record) || Model.Record.IsOpaqueTyped(record) || Model.Record.IsOpaqueUntyped(record))
+        if (Model.Record.IsTyped(record)
+            || Model.Record.IsOpaqueTyped(record)
+            || Model.Record.IsOpaqueUntyped(record)
+            || Model.Record.IsUntyped(record))
         {
             foreach (var method in record.Methods)
             {

diff --git a/src/Generation/Generator/Renderer/Internal/UntypedRecordHandle.cs b/src/Generation/Generator/Renderer/Internal/UntypedRecordHandle.cs
@@ -39,6 +39,27 @@ public abstract class {typeName} : SafeHandle
     protected {typeName}(bool ownsHandle) : base(IntPtr.Zero, ownsHandle) {{ }}
 
     {record.Fields.Select(x => RenderField(record, x)).Join(Environment.NewLine)}
+
+    public bool Equals({typeName}? other)
+    {{
+        if (ReferenceEquals(null, other))
+            return false;
+
+        if (ReferenceEquals(this, other))
+            return true;
+
+        return handle.Equals(other.handle);
+    }}
+
+    public override bool Equals(object? obj)
+    {{
+        return ReferenceEquals(this, obj) || obj is {typeName} other && Equals(other);
+    }}
+
+    public override int GetHashCode()
+    {{
+        return handle.GetHashCode();
+    }}
 }}
 
 public class {unownedHandleTypeName} : {typeName}

diff --git a/src/Generation/Generator/Renderer/Public/UntypedRecord.cs b/src/Generation/Generator/Renderer/Public/UntypedRecord.cs
@@ -54,6 +54,27 @@ public sealed partial class {name}
         .Where(Method.IsEnabled)
         .Select(MethodRenderer.Render)
         .Join(Environment.NewLine)}
+
+    public bool Equals({name}? other)
+    {{
+        if (ReferenceEquals(null, other))
+            return false;
+
+        if (ReferenceEquals(this, other))
+            return true;
+
+        return Handle.Equals(other.Handle);
+    }}
+
+    public override bool Equals(object? obj)
+    {{
+        return ReferenceEquals(this, obj) || obj is {name} other && Equals(other);
+    }}
+
+    public override int GetHashCode()
+    {{
+        return Handle.GetHashCode();
+    }}
 }}";
     }
 

diff --git a/src/Native/GirTestLib/girtest-untyped-record-tester.c b/src/Native/GirTestLib/girtest-untyped-record-tester.c
@@ -157,4 +157,18 @@ int girtest_untyped_record_tester_get_a_from_last_element_pointer(GirTestUntyped
 {
     GirTestUntypedRecordTester** result = array += (length-1);
     return (*result)->a;
+}
+
+/**
+ * girtest_untyped_record_tester_equals:
+ * @self: An instance
+ * @other: Another instance
+ *
+ * Compare the data of the given instances.
+ * 
+ * Returns: if the given instances contain the same data.
+ **/
+gboolean girtest_untyped_record_tester_equals(GirTestUntypedRecordTester *self, GirTestUntypedRecordTester *other)
+{
+    return self->a == other->a;
 }
diff --git a/src/Native/GirTestLib/girtest-untyped-record-tester.h b/src/Native/GirTestLib/girtest-untyped-record-tester.h
@@ -34,4 +34,5 @@ GirTestUntypedRecordTester* girtest_untyped_record_tester_callback_out_parameter
 GirTestUntypedRecordTester* girtest_untyped_record_tester_callback_out_parameter_callee_allocates(GirTestUntypedRecordCallbackOutParameterCalleeAllocates callback);
 int girtest_untyped_record_tester_get_a_from_last_element(GirTestUntypedRecordTester* array, int length);
 int girtest_untyped_record_tester_get_a_from_last_element_pointer(GirTestUntypedRecordTester** array, int length);
+gboolean girtest_untyped_record_tester_equals(GirTestUntypedRecordTester *self, GirTestUntypedRecordTester *other);
 G_END_DECLS
diff --git a/src/Tests/Libs/GirTest-0.1.Tests/UntypedRecordTest.cs b/src/Tests/Libs/GirTest-0.1.Tests/UntypedRecordTest.cs
@@ -124,4 +124,13 @@ public void IsSealed()
     {
         typeof(UntypedRecordTester).IsSealed.Should().BeTrue();
     }
+
+    [TestMethod]
+    public void HasNativeEqualsMethod()
+    {
+        var instance1 = new UntypedRecordTester();
+        var instance2 = new UntypedRecordTester();
+
+        instance1.NativeEquals(instance2).Should().BeTrue();
+    }
 }