Simplify IsTemplateParameterType

mono · Oct 19, 2023 · a2782dd · a2782dd
1 parent 19aa51b
commit a2782dd
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 12 deletions.
diff --git a/src/AST/TypeExtensions.cs b/src/AST/TypeExtensions.cs
@@ -439,18 +439,13 @@ public static bool IsDependentPointer(this Type type)
             return false;
         }
 
-        public static bool IsTemplate(this Type type)
+        public static bool IsTemplateParameterType(this Type type)
         {
             if (type is TemplateParameterType or TemplateParameterSubstitutionType)
                 return true;
 
-            var ptr = type;
-            while (ptr is PointerType pType)
-            {
-                ptr = pType.Pointee;
-                if (ptr is TemplateParameterType or TemplateParameterSubstitutionType)
-                    return true;
-            }
+            if (type is PointerType pt)
+                return pt.GetFinalPointee() is TemplateParameterType or TemplateParameterSubstitutionType;
 
             return false;
         }

diff --git a/src/Generator/Generators/CSharp/CSharpMarshal.cs b/src/Generator/Generators/CSharp/CSharpMarshal.cs
@@ -644,7 +644,7 @@ public override bool VisitPointerType(PointerType pointer, TypeQualifiers quals)
                 else
                 {
                     Context.Before.Write($"var {arg} = ");
-                    if (pointer.Pointee.IsTemplate())
+                    if (pointer.Pointee.IsTemplateParameterType())
                         Context.Before.Write($"(({Context.Parameter.Type}) (object) {Context.Parameter.Name})");
                     else
                         Context.Before.WriteLine(Context.Parameter.Name);
@@ -810,7 +810,7 @@ private void MarshalRefClass(Class @class)
 
         private void MarshalValueClass()
         {
-            if (Context.Parameter.Type.IsTemplate())
+            if (Context.Parameter.Type.IsTemplateParameterType())
                 Context.Return.Write($"(({Context.Parameter.Type}) (object) {Context.Parameter.Name})");
             else
                 Context.Return.Write(Context.Parameter.Name);

diff --git a/src/Generator/Types/Std/Stdlib.CSharp.cs b/src/Generator/Types/Std/Stdlib.CSharp.cs
@@ -330,7 +330,7 @@ public override void CSharpMarshalToNative(CSharpMarshalContext ctx)
                     Helpers.InternalStruct}.{assign.Name}(new {
                     typePrinter.IntPtrType}(&{
                     ctx.ReturnVarName}), ");
-                if (ctx.Parameter.Type.IsTemplate())
+                if (ctx.Parameter.Type.IsTemplateParameterType())
                     ctx.Return.Write("(string) (object) ");
                 ctx.Return.Write($"{ctx.Parameter.Name})");
                 ctx.ReturnVarName = string.Empty;
@@ -343,7 +343,7 @@ public override void CSharpMarshalToNative(CSharpMarshalContext ctx)
 
                 ctx.Before.Write($@"{qualifiedBasicString}Extensions.{
                     assign.Name}({varBasicString}, ");
-                if (ctx.Parameter.Type.IsTemplate())
+                if (ctx.Parameter.Type.IsTemplateParameterType())
                     ctx.Before.Write("(string) (object) ");
                 ctx.Before.WriteLine($"{ctx.Parameter.Name});");