TypeMap: refactor CSharp backend into common methods + migration

deadlocklogic · deadlocklogic · commit 15ecf3bbbd91 · 2023-12-05T08:29:00.000+02:00
diff --git a/src/Generator/AST/Utils.cs b/src/Generator/AST/Utils.cs
@@ -207,7 +207,7 @@ public static bool IsMappedToPrimitive(ITypeMapDatabase typeMaps, Type type)
                 return false;
 
             var typePrinterContext = new TypePrinterContext { Type = type };
-            var mappedTo = typeMap.CSharpSignatureType(typePrinterContext);
+            var mappedTo = typeMap.SignatureType(typePrinterContext);
             mappedTo = mappedTo.Desugar();
             mappedTo = (mappedTo.GetFinalPointee() ?? mappedTo).Desugar();
             return (mappedTo.IsPrimitiveType() ||
diff --git a/src/Generator/Generators/CSharp/CSharpMarshal.cs b/src/Generator/Generators/CSharp/CSharpMarshal.cs
@@ -45,7 +45,7 @@ public override bool VisitType(Type type, TypeQualifiers quals)
             TypeMap typeMap;
             if (Context.Context.TypeMaps.FindTypeMap(type, out typeMap) && typeMap.DoesMarshalling)
             {
-                typeMap.CSharpMarshalToManaged(Context);
+                typeMap.MarshalToManaged(Context);
                 return false;
             }
 
@@ -471,7 +471,7 @@ public override bool VisitType(Type type, TypeQualifiers quals)
             TypeMap typeMap;
             if (Context.Context.TypeMaps.FindTypeMap(type, out typeMap) && typeMap.DoesMarshalling)
             {
-                typeMap.CSharpMarshalToNative(Context);
+                typeMap.MarshalToNative(Context);
                 return false;
             }
 
diff --git a/src/Generator/Generators/CSharp/CSharpSources.cs b/src/Generator/Generators/CSharp/CSharpSources.cs
@@ -3158,7 +3158,7 @@ public void GenerateFunctionCall(string functionName, Function function,
                             Type = indirectRetType.Type.Desugar()
                         };
 
-                        WriteLine("{0} {1};", typeMap.CSharpSignatureType(typePrinterContext),
+                        WriteLine("{0} {1};", typeMap.SignatureType(typePrinterContext),
                             Helpers.ReturnIdentifier);
                     }
                     else
diff --git a/src/Generator/Generators/CSharp/CSharpTypePrinter.cs b/src/Generator/Generators/CSharp/CSharpTypePrinter.cs
@@ -36,7 +36,7 @@ public override TypePrinterResult VisitTagType(TagType tag, TypeQualifiers quals
                 return string.Empty;
 
             TypeMap typeMap;
-            if (TypeMapDatabase.FindTypeMap(tag, out typeMap))
+            if (TypeMapDatabase.FindTypeMap(tag, GeneratorKind.CSharp, out typeMap))
             {
                 typeMap.Type = tag;
 
@@ -47,7 +47,7 @@ public override TypePrinterResult VisitTagType(TagType tag, TypeQualifiers quals
                     Type = tag
                 };
 
-                return typeMap.CSharpSignatureType(typePrinterContext).ToString();
+                return typeMap.SignatureType(typePrinterContext).ToString();
             }
 
             return base.VisitTagType(tag, quals);
@@ -150,7 +150,7 @@ public override TypePrinterResult VisitArrayType(ArrayType array,
         public override TypePrinterResult VisitBuiltinType(BuiltinType builtin, TypeQualifiers quals)
         {
             TypeMap typeMap;
-            if (TypeMapDatabase.FindTypeMap(builtin, out typeMap))
+            if (TypeMapDatabase.FindTypeMap(builtin, GeneratorKind.CSharp, out typeMap))
             {
                 var typePrinterContext = new TypePrinterContext()
                 {
@@ -159,7 +159,7 @@ public override TypePrinterResult VisitBuiltinType(BuiltinType builtin, TypeQual
                     Type = builtin,
                     Parameter = Parameter
                 };
-                return typeMap.CSharpSignatureType(typePrinterContext).Visit(this);
+                return typeMap.SignatureType(typePrinterContext).Visit(this);
             }
             return base.VisitBuiltinType(builtin, quals);
         }
@@ -183,15 +183,15 @@ public override TypePrinterResult VisitPointerType(PointerType pointer,
             if (allowStrings && pointer.IsConstCharString())
             {
                 TypeMap typeMap;
-                TypeMapDatabase.FindTypeMap(pointer, out typeMap);
+                TypeMapDatabase.FindTypeMap(pointer, GeneratorKind.CSharp, out typeMap);
                 var typePrinterContext = new TypePrinterContext()
                 {
                     Kind = ContextKind,
                     MarshalKind = MarshalKind,
                     Type = pointer.Pointee,
                     Parameter = Parameter
                 };
-                return typeMap.CSharpSignatureType(typePrinterContext).Visit(this);
+                return typeMap.SignatureType(typePrinterContext).Visit(this);
             }
 
             var pointee = pointer.Pointee.Desugar();
@@ -258,7 +258,7 @@ public override TypePrinterResult VisitTypedefType(TypedefType typedef,
             var decl = typedef.Declaration;
 
             TypeMap typeMap;
-            if (TypeMapDatabase.FindTypeMap(typedef, out typeMap))
+            if (TypeMapDatabase.FindTypeMap(typedef, GeneratorKind.CSharp, out typeMap))
             {
                 typeMap.Type = typedef;
 
@@ -270,7 +270,7 @@ public override TypePrinterResult VisitTypedefType(TypedefType typedef,
                     Parameter = Parameter
                 };
 
-                return typeMap.CSharpSignatureType(typePrinterContext).ToString();
+                return typeMap.SignatureType(typePrinterContext).ToString();
             }
 
             FunctionType func;
@@ -299,7 +299,7 @@ public override TypePrinterResult VisitTemplateSpecializationType(
                 template.Template.TemplatedDecl;
 
             TypeMap typeMap;
-            if (!TypeMapDatabase.FindTypeMap(template, out typeMap))
+            if (!TypeMapDatabase.FindTypeMap(template, GeneratorKind.CSharp, out typeMap))
             {
                 if (ContextKind == TypePrinterContextKind.Managed &&
                     decl == template.Template.TemplatedDecl &&
@@ -330,7 +330,7 @@ public override TypePrinterResult VisitTemplateSpecializationType(
                 MarshalKind = MarshalKind
             };
 
-            return typeMap.CSharpSignatureType(typePrinterContext).ToString();
+            return typeMap.SignatureType(typePrinterContext).ToString();
         }
 
         public override TypePrinterResult VisitDependentTemplateSpecializationType(
diff --git a/src/Generator/Generators/ExtensionMethods.cs b/src/Generator/Generators/ExtensionMethods.cs
@@ -63,12 +63,9 @@ public static Type GetMappedType(this Type type, TypeMapDatabase typeMaps,
                     Type = typeMap.Type
                 };
 
-                switch (generatorKind)
+                if (generatorKind == GeneratorKind.CLI || generatorKind == GeneratorKind.CSharp)
                 {
-                    case var _ when ReferenceEquals(generatorKind, GeneratorKind.CLI):
-                        return typeMap.SignatureType(typePrinterContext).Desugar();
-                    case var _ when ReferenceEquals(generatorKind, GeneratorKind.CSharp):
-                        return typeMap.CSharpSignatureType(typePrinterContext).Desugar();
+                    return typeMap.SignatureType(typePrinterContext).Desugar();
                 }
             }
 
diff --git a/src/Generator/Passes/ExpressionHelper.cs b/src/Generator/Passes/ExpressionHelper.cs
@@ -68,9 +68,9 @@ internal static class ExpressionHelper
 
         public static System.Type GetSystemType(BindingContext context, Type type)
         {
-            if (context.TypeMaps.FindTypeMap(type, out TypeMap typeMap))
+            if (context.TypeMaps.FindTypeMap(type, GeneratorKind.CSharp, out TypeMap typeMap))
             {
-                var cilType = typeMap.CSharpSignatureType(new TypePrinterContext { Type = type, Kind = TypePrinterContextKind.Managed }) as CILType;
+                var cilType = typeMap.SignatureType(new TypePrinterContext { Type = type, Kind = TypePrinterContextKind.Managed }) as CILType;
                 if (cilType != null)
                     return cilType.Type;
             }
@@ -239,7 +239,7 @@ private static bool CheckForDefaultPointer(BindingContext context, Type desugare
             var typePrinterResult = type.Visit(typePrinter);
 
             TypeMap typeMap;
-            if (context.TypeMaps.FindTypeMap(type, out typeMap))
+            if (context.TypeMaps.FindTypeMap(type, GeneratorKind.CSharp, out typeMap))
             {
                 var typePrinterContext = new TypePrinterContext()
                 {
@@ -248,7 +248,7 @@ private static bool CheckForDefaultPointer(BindingContext context, Type desugare
                     Type = type
                 };
 
-                var typeInSignature = typeMap.CSharpSignatureType(typePrinterContext)
+                var typeInSignature = typeMap.SignatureType(typePrinterContext)
                     .SkipPointerRefs().Desugar();
 
                 Enumeration @enum;
@@ -413,7 +413,7 @@ private static bool CheckForChar(BindingContext context, Type desugared, ref str
 
         private static bool CheckForString(BindingContext context, Type desugared, ref string result)
         {
-            if (context.TypeMaps.FindTypeMap(desugared, out TypeMap typeMap))
+            if (context.TypeMaps.FindTypeMap(desugared, GeneratorKind.CSharp, out TypeMap typeMap))
             {
                 var typePrinterContext = new TypePrinterContext()
                 {
@@ -422,7 +422,7 @@ private static bool CheckForString(BindingContext context, Type desugared, ref s
                     Type = desugared
                 };
 
-                var typeInSignature = typeMap.CSharpSignatureType(typePrinterContext)
+                var typeInSignature = typeMap.SignatureType(typePrinterContext)
                     .SkipPointerRefs().Desugar();
 
                 if (typeInSignature is CILType managed && managed.Type == typeof(string))
diff --git a/src/Generator/Passes/ValidateOperatorsPass.cs b/src/Generator/Passes/ValidateOperatorsPass.cs
@@ -90,9 +90,9 @@ private bool IsValidOperatorOverload(Method @operator)
                                 return type.IsPrimitiveType(PrimitiveType.Int);
                             case var _ when ReferenceEquals(kind, GeneratorKind.CSharp):
                                 Types.TypeMap typeMap;
-                                if (Context.TypeMaps.FindTypeMap(type, out typeMap))
+                                if (Context.TypeMaps.FindTypeMap(type, GeneratorKind.CSharp, out typeMap))
                                 {
-                                    var mappedTo = typeMap.CSharpSignatureType(
+                                    var mappedTo = typeMap.SignatureType(
                                         new TypePrinterContext
                                         {
                                             Parameter = parameter,
diff --git a/src/Generator/Types/Std/Stdlib.CLI.cs b/src/Generator/Types/Std/Stdlib.CLI.cs
@@ -5,12 +5,11 @@
 using CppSharp.Generators.AST;
 using CppSharp.Generators.C;
 using CppSharp.Generators.CLI;
-using CppSharp.Generators.CSharp;
 
-namespace CppSharp.Types.Std
+namespace CppSharp.Types.Std.CLI
 {
     [TypeMap("const char*", GeneratorKindID = GeneratorKind.CLI_ID)]
-    public partial class ConstCharPointer : TypeMap
+    public class ConstCharPointer : TypeMap
     {
         public override Type SignatureType(TypePrinterContext ctx, GeneratorKind kind)
         {
@@ -57,33 +56,32 @@ public override void MarshalToManaged(MarshalContext ctx, GeneratorKind kind)
                     $"{Context.Options.Encoding.EncodingName} is not supported yet.");
 
             ctx.Return.Write(
-                $@"({ctx.ReturnVarName} == 0 ? nullptr : clix::marshalString<clix::{
-                    param}>({ctx.ReturnVarName}))");
+                $@"({ctx.ReturnVarName} == 0 ? nullptr : clix::marshalString<clix::{param}>({ctx.ReturnVarName}))");
         }
     }
 
     [TypeMap("const char[]", GeneratorKindID = GeneratorKind.CLI_ID)]
-    public partial class ConstCharArray : ConstCharPointer
+    public class ConstCharArray : ConstCharPointer
     {
     }
 
     [TypeMap("const wchar_t*", GeneratorKindID = GeneratorKind.CLI_ID)]
-    public partial class ConstWCharTPointer : ConstCharPointer
+    public class ConstWCharTPointer : ConstCharPointer
     {
     }
 
     [TypeMap("const char16_t*", GeneratorKindID = GeneratorKind.CLI_ID)]
-    public partial class ConstChar16TPointer : ConstCharPointer
+    public class ConstChar16TPointer : ConstCharPointer
     {
     }
 
     [TypeMap("const char32_t*", GeneratorKindID = GeneratorKind.CLI_ID)]
-    public partial class ConstChar32TPointer : ConstCharPointer
+    public class ConstChar32TPointer : ConstCharPointer
     {
     }
 
     [TypeMap("basic_string<char, char_traits<char>, allocator<char>>", GeneratorKindID = GeneratorKind.CLI_ID)]
-    public partial class String : TypeMap
+    public class String : TypeMap
     {
         public override Type SignatureType(TypePrinterContext ctx, GeneratorKind kind)
         {
@@ -104,7 +102,7 @@ public override void MarshalToManaged(MarshalContext ctx, GeneratorKind kind)
     }
 
     [TypeMap("std::wstring", GeneratorKindID = GeneratorKind.CLI_ID)]
-    public partial class WString : TypeMap
+    public class WString : TypeMap
     {
         public override Type SignatureType(TypePrinterContext ctx, GeneratorKind kind)
         {
@@ -125,7 +123,7 @@ public override void MarshalToManaged(MarshalContext ctx, GeneratorKind kind)
     }
 
     [TypeMap("std::vector", GeneratorKindID = GeneratorKind.CLI_ID)]
-    public partial class Vector : TypeMap
+    public class Vector : TypeMap
     {
         public override bool IsIgnored
         {
@@ -259,16 +257,15 @@ public override void MarshalToManaged(MarshalContext ctx, GeneratorKind kind)
     }
 
     [TypeMap("std::map", GeneratorKindID = GeneratorKind.CLI_ID)]
-    public partial class Map : TypeMap
+    public class Map : TypeMap
     {
         public override bool IsIgnored { get { return true; } }
 
         public override Type SignatureType(TypePrinterContext ctx, GeneratorKind kind)
         {
             var type = Type as TemplateSpecializationType;
             return new CustomType(
-                $@"::System::Collections::Generic::Dictionary<{
-                    type.Arguments[0].Type}, {type.Arguments[1].Type}>^");
+                $@"::System::Collections::Generic::Dictionary<{type.Arguments[0].Type}, {type.Arguments[1].Type}>^");
         }
 
         public override void MarshalToNative(MarshalContext ctx, GeneratorKind kind)
@@ -283,19 +280,19 @@ public override void MarshalToManaged(MarshalContext ctx, GeneratorKind kind)
     }
 
     [TypeMap("std::list", GeneratorKindID = GeneratorKind.CLI_ID)]
-    public partial class List : TypeMap
+    public class List : TypeMap
     {
         public override bool IsIgnored { get { return true; } }
     }
 
     [TypeMap("std::shared_ptr", GeneratorKindID = GeneratorKind.CLI_ID)]
-    public partial class SharedPtr : TypeMap
+    public class SharedPtr : TypeMap
     {
         public override bool IsIgnored { get { return true; } }
     }
 
     [TypeMap("basic_ostream<char, char_traits<char>>", GeneratorKind.CLI_ID)]
-    public partial class OStream : TypeMap
+    public class OStream : TypeMap
     {
         public override Type SignatureType(TypePrinterContext ctx, GeneratorKind kind)
         {
@@ -315,7 +312,7 @@ public override void MarshalToNative(MarshalContext ctx, GeneratorKind kind)
     }
 
     [TypeMap("std::nullptr_t", GeneratorKindID = GeneratorKind.CLI_ID)]
-    public partial class NullPtr : TypeMap
+    public class NullPtr : TypeMap
     {
         public override bool DoesMarshalling { get { return false; } }
 
diff --git a/src/Generator/Types/Std/Stdlib.CSharp.cs b/src/Generator/Types/Std/Stdlib.CSharp.cs
diff --git a/src/Generator/Types/TypeMap.cs b/src/Generator/Types/TypeMap.cs
diff --git a/tests/dotnet/CSharp/CSharp.Gen.cs b/tests/dotnet/CSharp/CSharp.Gen.cs
diff --git a/tests/dotnet/Common/Common.Gen.cs b/tests/dotnet/Common/Common.Gen.cs

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public override bool VisitType(Type type, TypeQualifiers quals)`
`45`	`45`	`TypeMap typeMap;`
`46`	`46`	`if (Context.Context.TypeMaps.FindTypeMap(type, out typeMap) && typeMap.DoesMarshalling)`
`47`	`47`	`{`
`48`		`- typeMap.CSharpMarshalToManaged(Context);`
	`48`	`+ typeMap.MarshalToManaged(Context);`
`49`	`49`	`return false;`
`50`	`50`	`}`
`51`	`51`
`@@ -471,7 +471,7 @@ public override bool VisitType(Type type, TypeQualifiers quals)`
`471`	`471`	`TypeMap typeMap;`
`472`	`472`	`if (Context.Context.TypeMaps.FindTypeMap(type, out typeMap) && typeMap.DoesMarshalling)`
`473`	`473`	`{`
`474`		`- typeMap.CSharpMarshalToNative(Context);`
	`474`	`+ typeMap.MarshalToNative(Context);`
`475`	`475`	`return false;`
`476`	`476`	`}`
`477`	`477`
Original file line number	Diff line number	Diff line change
`@@ -3158,7 +3158,7 @@ public void GenerateFunctionCall(string functionName, Function function,`
`3158`	`3158`	`Type = indirectRetType.Type.Desugar()`
`3159`	`3159`	`};`
`3160`	`3160`
`3161`		`- WriteLine("{0} {1};", typeMap.CSharpSignatureType(typePrinterContext),`
	`3161`	`+ WriteLine("{0} {1};", typeMap.SignatureType(typePrinterContext),`
`3162`	`3162`	`Helpers.ReturnIdentifier);`
`3163`	`3163`	`}`
`3164`	`3164`	`else`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public override TypePrinterResult VisitTagType(TagType tag, TypeQualifiers quals`
`36`	`36`	`return string.Empty;`
`37`	`37`
`38`	`38`	`TypeMap typeMap;`
`39`		`- if (TypeMapDatabase.FindTypeMap(tag, out typeMap))`
	`39`	`+ if (TypeMapDatabase.FindTypeMap(tag, GeneratorKind.CSharp, out typeMap))`
`40`	`40`	`{`
`41`	`41`	`typeMap.Type = tag;`
`42`	`42`
`@@ -47,7 +47,7 @@ public override TypePrinterResult VisitTagType(TagType tag, TypeQualifiers quals`
`47`	`47`	`Type = tag`
`48`	`48`	`};`
`49`	`49`
`50`		`- return typeMap.CSharpSignatureType(typePrinterContext).ToString();`
	`50`	`+ return typeMap.SignatureType(typePrinterContext).ToString();`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`return base.VisitTagType(tag, quals);`
`@@ -150,7 +150,7 @@ public override TypePrinterResult VisitArrayType(ArrayType array,`
`150`	`150`	`public override TypePrinterResult VisitBuiltinType(BuiltinType builtin, TypeQualifiers quals)`
`151`	`151`	`{`
`152`	`152`	`TypeMap typeMap;`
`153`		`- if (TypeMapDatabase.FindTypeMap(builtin, out typeMap))`
	`153`	`+ if (TypeMapDatabase.FindTypeMap(builtin, GeneratorKind.CSharp, out typeMap))`
`154`	`154`	`{`
`155`	`155`	`var typePrinterContext = new TypePrinterContext()`
`156`	`156`	`{`
`@@ -159,7 +159,7 @@ public override TypePrinterResult VisitBuiltinType(BuiltinType builtin, TypeQual`
`159`	`159`	`Type = builtin,`
`160`	`160`	`Parameter = Parameter`
`161`	`161`	`};`
`162`		`- return typeMap.CSharpSignatureType(typePrinterContext).Visit(this);`
	`162`	`+ return typeMap.SignatureType(typePrinterContext).Visit(this);`
`163`	`163`	`}`
`164`	`164`	`return base.VisitBuiltinType(builtin, quals);`
`165`	`165`	`}`
`@@ -183,15 +183,15 @@ public override TypePrinterResult VisitPointerType(PointerType pointer,`
`183`	`183`	`if (allowStrings && pointer.IsConstCharString())`
`184`	`184`	`{`
`185`	`185`	`TypeMap typeMap;`
`186`		`- TypeMapDatabase.FindTypeMap(pointer, out typeMap);`
	`186`	`+ TypeMapDatabase.FindTypeMap(pointer, GeneratorKind.CSharp, out typeMap);`
`187`	`187`	`var typePrinterContext = new TypePrinterContext()`
`188`	`188`	`{`
`189`	`189`	`Kind = ContextKind,`
`190`	`190`	`MarshalKind = MarshalKind,`
`191`	`191`	`Type = pointer.Pointee,`
`192`	`192`	`Parameter = Parameter`
`193`	`193`	`};`
`194`		`- return typeMap.CSharpSignatureType(typePrinterContext).Visit(this);`
	`194`	`+ return typeMap.SignatureType(typePrinterContext).Visit(this);`
`195`	`195`	`}`
`196`	`196`
`197`	`197`	`var pointee = pointer.Pointee.Desugar();`
`@@ -258,7 +258,7 @@ public override TypePrinterResult VisitTypedefType(TypedefType typedef,`
`258`	`258`	`var decl = typedef.Declaration;`
`259`	`259`
`260`	`260`	`TypeMap typeMap;`
`261`		`- if (TypeMapDatabase.FindTypeMap(typedef, out typeMap))`
	`261`	`+ if (TypeMapDatabase.FindTypeMap(typedef, GeneratorKind.CSharp, out typeMap))`
`262`	`262`	`{`
`263`	`263`	`typeMap.Type = typedef;`
`264`	`264`
`@@ -270,7 +270,7 @@ public override TypePrinterResult VisitTypedefType(TypedefType typedef,`
`270`	`270`	`Parameter = Parameter`
`271`	`271`	`};`
`272`	`272`
`273`		`- return typeMap.CSharpSignatureType(typePrinterContext).ToString();`
	`273`	`+ return typeMap.SignatureType(typePrinterContext).ToString();`
`274`	`274`	`}`
`275`	`275`
`276`	`276`	`FunctionType func;`
`@@ -299,7 +299,7 @@ public override TypePrinterResult VisitTemplateSpecializationType(`
`299`	`299`	`template.Template.TemplatedDecl;`
`300`	`300`
`301`	`301`	`TypeMap typeMap;`
`302`		`- if (!TypeMapDatabase.FindTypeMap(template, out typeMap))`
	`302`	`+ if (!TypeMapDatabase.FindTypeMap(template, GeneratorKind.CSharp, out typeMap))`
`303`	`303`	`{`
`304`	`304`	`if (ContextKind == TypePrinterContextKind.Managed &&`
`305`	`305`	`decl == template.Template.TemplatedDecl &&`
`@@ -330,7 +330,7 @@ public override TypePrinterResult VisitTemplateSpecializationType(`
`330`	`330`	`MarshalKind = MarshalKind`
`331`	`331`	`};`
`332`	`332`
`333`		`- return typeMap.CSharpSignatureType(typePrinterContext).ToString();`
	`333`	`+ return typeMap.SignatureType(typePrinterContext).ToString();`
`334`	`334`	`}`
`335`	`335`
`336`	`336`	`public override TypePrinterResult VisitDependentTemplateSpecializationType(`
Original file line number	Diff line number	Diff line change
`@@ -63,12 +63,9 @@ public static Type GetMappedType(this Type type, TypeMapDatabase typeMaps,`
`63`	`63`	`Type = typeMap.Type`
`64`	`64`	`};`
`65`	`65`
`66`		`- switch (generatorKind)`
	`66`	`+ if (generatorKind == GeneratorKind.CLI \|\| generatorKind == GeneratorKind.CSharp)`
`67`	`67`	`{`
`68`		`- case var _ when ReferenceEquals(generatorKind, GeneratorKind.CLI):`
`69`		`- return typeMap.SignatureType(typePrinterContext).Desugar();`
`70`		`- case var _ when ReferenceEquals(generatorKind, GeneratorKind.CSharp):`
`71`		`- return typeMap.CSharpSignatureType(typePrinterContext).Desugar();`
	`68`	`+ return typeMap.SignatureType(typePrinterContext).Desugar();`
`72`	`69`	`}`
`73`	`70`	`}`
`74`	`71`
Original file line number	Diff line number	Diff line change
`@@ -68,9 +68,9 @@ internal static class ExpressionHelper`
`68`	`68`
`69`	`69`	`public static System.Type GetSystemType(BindingContext context, Type type)`
`70`	`70`	`{`
`71`		`- if (context.TypeMaps.FindTypeMap(type, out TypeMap typeMap))`
	`71`	`+ if (context.TypeMaps.FindTypeMap(type, GeneratorKind.CSharp, out TypeMap typeMap))`
`72`	`72`	`{`
`73`		`- var cilType = typeMap.CSharpSignatureType(new TypePrinterContext { Type = type, Kind = TypePrinterContextKind.Managed }) as CILType;`
	`73`	`+ var cilType = typeMap.SignatureType(new TypePrinterContext { Type = type, Kind = TypePrinterContextKind.Managed }) as CILType;`
`74`	`74`	`if (cilType != null)`
`75`	`75`	`return cilType.Type;`
`76`	`76`	`}`
`@@ -239,7 +239,7 @@ private static bool CheckForDefaultPointer(BindingContext context, Type desugare`
`239`	`239`	`var typePrinterResult = type.Visit(typePrinter);`
`240`	`240`
`241`	`241`	`TypeMap typeMap;`
`242`		`- if (context.TypeMaps.FindTypeMap(type, out typeMap))`
	`242`	`+ if (context.TypeMaps.FindTypeMap(type, GeneratorKind.CSharp, out typeMap))`
`243`	`243`	`{`
`244`	`244`	`var typePrinterContext = new TypePrinterContext()`
`245`	`245`	`{`
`@@ -248,7 +248,7 @@ private static bool CheckForDefaultPointer(BindingContext context, Type desugare`
`248`	`248`	`Type = type`
`249`	`249`	`};`
`250`	`250`
`251`		`- var typeInSignature = typeMap.CSharpSignatureType(typePrinterContext)`
	`251`	`+ var typeInSignature = typeMap.SignatureType(typePrinterContext)`
`252`	`252`	`.SkipPointerRefs().Desugar();`
`253`	`253`
`254`	`254`	`Enumeration @enum;`
`@@ -413,7 +413,7 @@ private static bool CheckForChar(BindingContext context, Type desugared, ref str`
`413`	`413`
`414`	`414`	`private static bool CheckForString(BindingContext context, Type desugared, ref string result)`
`415`	`415`	`{`
`416`		`- if (context.TypeMaps.FindTypeMap(desugared, out TypeMap typeMap))`
	`416`	`+ if (context.TypeMaps.FindTypeMap(desugared, GeneratorKind.CSharp, out TypeMap typeMap))`
`417`	`417`	`{`
`418`	`418`	`var typePrinterContext = new TypePrinterContext()`
`419`	`419`	`{`
`@@ -422,7 +422,7 @@ private static bool CheckForString(BindingContext context, Type desugared, ref s`
`422`	`422`	`Type = desugared`
`423`	`423`	`};`
`424`	`424`
`425`		`- var typeInSignature = typeMap.CSharpSignatureType(typePrinterContext)`
	`425`	`+ var typeInSignature = typeMap.SignatureType(typePrinterContext)`
`426`	`426`	`.SkipPointerRefs().Desugar();`
`427`	`427`
`428`	`428`	`if (typeInSignature is CILType managed && managed.Type == typeof(string))`
Original file line number	Diff line number	Diff line change
`@@ -90,9 +90,9 @@ private bool IsValidOperatorOverload(Method @operator)`
`90`	`90`	`return type.IsPrimitiveType(PrimitiveType.Int);`
`91`	`91`	`case var _ when ReferenceEquals(kind, GeneratorKind.CSharp):`
`92`	`92`	`Types.TypeMap typeMap;`
`93`		`- if (Context.TypeMaps.FindTypeMap(type, out typeMap))`
	`93`	`+ if (Context.TypeMaps.FindTypeMap(type, GeneratorKind.CSharp, out typeMap))`
`94`	`94`	`{`
`95`		`- var mappedTo = typeMap.CSharpSignatureType(`
	`95`	`+ var mappedTo = typeMap.SignatureType(`
`96`	`96`	`new TypePrinterContext`
`97`	`97`	`{`
`98`	`98`	`Parameter = parameter,`
Original file line number	Diff line number	Diff line change
`@@ -5,12 +5,11 @@`
`5`	`5`	`using CppSharp.Generators.AST;`
`6`	`6`	`using CppSharp.Generators.C;`
`7`	`7`	`using CppSharp.Generators.CLI;`
`8`		`-using CppSharp.Generators.CSharp;`
`9`	`8`
`10`		`-namespace CppSharp.Types.Std`
	`9`	`+namespace CppSharp.Types.Std.CLI`
`11`	`10`	`{`
`12`	`11`	`[TypeMap("const char*", GeneratorKindID = GeneratorKind.CLI_ID)]`
`13`		`- public partial class ConstCharPointer : TypeMap`
	`12`	`+ public class ConstCharPointer : TypeMap`
`14`	`13`	`{`
`15`	`14`	`public override Type SignatureType(TypePrinterContext ctx, GeneratorKind kind)`
`16`	`15`	`{`
`@@ -57,33 +56,32 @@ public override void MarshalToManaged(MarshalContext ctx, GeneratorKind kind)`
`57`	`56`	`$"{Context.Options.Encoding.EncodingName} is not supported yet.");`
`58`	`57`
`59`	`58`	`ctx.Return.Write(`
`60`		`- $@"({ctx.ReturnVarName} == 0 ? nullptr : clix::marshalString<clix::{`
`61`		`- param}>({ctx.ReturnVarName}))");`
	`59`	`+ $@"({ctx.ReturnVarName} == 0 ? nullptr : clix::marshalString<clix::{param}>({ctx.ReturnVarName}))");`
`62`	`60`	`}`
`63`	`61`	`}`
`64`	`62`
`65`	`63`	`[TypeMap("const char[]", GeneratorKindID = GeneratorKind.CLI_ID)]`
`66`		`- public partial class ConstCharArray : ConstCharPointer`
	`64`	`+ public class ConstCharArray : ConstCharPointer`
`67`	`65`	`{`
`68`	`66`	`}`
`69`	`67`
`70`	`68`	`[TypeMap("const wchar_t*", GeneratorKindID = GeneratorKind.CLI_ID)]`
`71`		`- public partial class ConstWCharTPointer : ConstCharPointer`
	`69`	`+ public class ConstWCharTPointer : ConstCharPointer`
`72`	`70`	`{`
`73`	`71`	`}`
`74`	`72`
`75`	`73`	`[TypeMap("const char16_t*", GeneratorKindID = GeneratorKind.CLI_ID)]`
`76`		`- public partial class ConstChar16TPointer : ConstCharPointer`
	`74`	`+ public class ConstChar16TPointer : ConstCharPointer`
`77`	`75`	`{`
`78`	`76`	`}`
`79`	`77`
`80`	`78`	`[TypeMap("const char32_t*", GeneratorKindID = GeneratorKind.CLI_ID)]`
`81`		`- public partial class ConstChar32TPointer : ConstCharPointer`
	`79`	`+ public class ConstChar32TPointer : ConstCharPointer`
`82`	`80`	`{`
`83`	`81`	`}`
`84`	`82`
`85`	`83`	`[TypeMap("basic_string<char, char_traits<char>, allocator<char>>", GeneratorKindID = GeneratorKind.CLI_ID)]`
`86`		`- public partial class String : TypeMap`
	`84`	`+ public class String : TypeMap`
`87`	`85`	`{`
`88`	`86`	`public override Type SignatureType(TypePrinterContext ctx, GeneratorKind kind)`
`89`	`87`	`{`
`@@ -104,7 +102,7 @@ public override void MarshalToManaged(MarshalContext ctx, GeneratorKind kind)`
`104`	`102`	`}`
`105`	`103`
`106`	`104`	`[TypeMap("std::wstring", GeneratorKindID = GeneratorKind.CLI_ID)]`
`107`		`- public partial class WString : TypeMap`
	`105`	`+ public class WString : TypeMap`
`108`	`106`	`{`
`109`	`107`	`public override Type SignatureType(TypePrinterContext ctx, GeneratorKind kind)`
`110`	`108`	`{`
`@@ -125,7 +123,7 @@ public override void MarshalToManaged(MarshalContext ctx, GeneratorKind kind)`
`125`	`123`	`}`
`126`	`124`
`127`	`125`	`[TypeMap("std::vector", GeneratorKindID = GeneratorKind.CLI_ID)]`
`128`		`- public partial class Vector : TypeMap`
	`126`	`+ public class Vector : TypeMap`
`129`	`127`	`{`
`130`	`128`	`public override bool IsIgnored`
`131`	`129`	`{`
`@@ -259,16 +257,15 @@ public override void MarshalToManaged(MarshalContext ctx, GeneratorKind kind)`
`259`	`257`	`}`
`260`	`258`
`261`	`259`	`[TypeMap("std::map", GeneratorKindID = GeneratorKind.CLI_ID)]`
`262`		`- public partial class Map : TypeMap`
	`260`	`+ public class Map : TypeMap`
`263`	`261`	`{`
`264`	`262`	`public override bool IsIgnored { get { return true; } }`
`265`	`263`
`266`	`264`	`public override Type SignatureType(TypePrinterContext ctx, GeneratorKind kind)`
`267`	`265`	`{`
`268`	`266`	`var type = Type as TemplateSpecializationType;`
`269`	`267`	`return new CustomType(`
`270`		`- $@"::System::Collections::Generic::Dictionary<{`
`271`		`- type.Arguments[0].Type}, {type.Arguments[1].Type}>^");`
	`268`	`+ $@"::System::Collections::Generic::Dictionary<{type.Arguments[0].Type}, {type.Arguments[1].Type}>^");`
`272`	`269`	`}`
`273`	`270`
`274`	`271`	`public override void MarshalToNative(MarshalContext ctx, GeneratorKind kind)`
`@@ -283,19 +280,19 @@ public override void MarshalToManaged(MarshalContext ctx, GeneratorKind kind)`
`283`	`280`	`}`
`284`	`281`
`285`	`282`	`[TypeMap("std::list", GeneratorKindID = GeneratorKind.CLI_ID)]`
`286`		`- public partial class List : TypeMap`
	`283`	`+ public class List : TypeMap`
`287`	`284`	`{`
`288`	`285`	`public override bool IsIgnored { get { return true; } }`
`289`	`286`	`}`
`290`	`287`
`291`	`288`	`[TypeMap("std::shared_ptr", GeneratorKindID = GeneratorKind.CLI_ID)]`
`292`		`- public partial class SharedPtr : TypeMap`
	`289`	`+ public class SharedPtr : TypeMap`
`293`	`290`	`{`
`294`	`291`	`public override bool IsIgnored { get { return true; } }`
`295`	`292`	`}`
`296`	`293`
`297`	`294`	`[TypeMap("basic_ostream<char, char_traits<char>>", GeneratorKind.CLI_ID)]`
`298`		`- public partial class OStream : TypeMap`
	`295`	`+ public class OStream : TypeMap`
`299`	`296`	`{`
`300`	`297`	`public override Type SignatureType(TypePrinterContext ctx, GeneratorKind kind)`
`301`	`298`	`{`
`@@ -315,7 +312,7 @@ public override void MarshalToNative(MarshalContext ctx, GeneratorKind kind)`
`315`	`312`	`}`
`316`	`313`
`317`	`314`	`[TypeMap("std::nullptr_t", GeneratorKindID = GeneratorKind.CLI_ID)]`
`318`		`- public partial class NullPtr : TypeMap`
	`315`	`+ public class NullPtr : TypeMap`
`319`	`316`	`{`
`320`	`317`	`public override bool DoesMarshalling { get { return false; } }`
`321`	`318`