(#354) TODO sweep, better typoe checks

ForNeVeR · Nov 21, 2023 · b36a109 · b36a109
1 parent 44c0f1a
commit b36a109
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 8 deletions.
diff --git a/Cesium.CodeGen/Extensions/TypeSystemEx.cs b/Cesium.CodeGen/Extensions/TypeSystemEx.cs
@@ -4,6 +4,7 @@
 using Cesium.CodeGen.Ir.Types;
 using Cesium.Core;
 using Mono.Cecil;
+using Mono.Cecil.Rocks;
 using PointerType = Mono.Cecil.PointerType;
 
 namespace Cesium.CodeGen.Extensions;
@@ -160,18 +161,31 @@ private static bool TypesCorrespond(TypeSystem typeSystem, TypeReference type1,
             return type1 is PointerType pt && pt.ElementType.IsEqualTo(typeSystem.Void);
         }
 
-        if (!type2.IsGenericInstance) return false;
-        type2 = type2.GetElementType();
+        if (type2 is not GenericInstanceType type2Instance) return false;
+        var type2Definition = type2.GetElementType();
         if (type1.IsPointer)
         {
-            // TODO: Analyze the generic argument.
-            return type2.FullName == CPtrFullTypeName;
+            if (type2Definition.FullName != CPtrFullTypeName)
+            {
+                // Non-pointer gets compared to a pointer.
+                return false;
+            }
+
+            var pointed1 = ((PointerType)type1).ElementType;
+            var pointed2 = type2Instance.GenericArguments.Single();
+            return TypesCorrespond(typeSystem, pointed1, pointed2);
         }
 
         if (type1.IsFunctionPointer)
         {
-            // TODO: Analyze the generic argument.
-            return type2.FullName == FuncPtrFullTypeName;
+            if (type2Definition.FullName != FuncPtrFullTypeName)
+            {
+                // A function pointer gets compared to not a function pointer.
+                return false;
+            }
+
+            // TODO: Compare the function type signatures here.
+            return true;
         }
 
         throw new AssertException("Impossible: type1 should be either a pointer or a function pointer.");

diff --git a/Cesium.Test.Framework/CSharpCompilationUtil.cs b/Cesium.Test.Framework/CSharpCompilationUtil.cs
@@ -15,10 +15,8 @@ public static class CSharpCompilationUtil
     private const string _projectName = "TestProject";
 
     /// <summary>Semaphore that controls the amount of simultaneously running tests.</summary>
-    // TODO: Should not be static, make a fixture.
     private static readonly SemaphoreSlim _testSemaphore = new(Environment.ProcessorCount);
 
-    // TODO: Support references
     public static async Task<string> CompileCSharpAssembly(
         ITestOutputHelper output,
         TargetRuntimeDescriptor runtime,