Added a type map for char.

ddobrev · ddobrev · commit 43bb2ee4bb00 · 2019-01-02T02:17:19.000+02:00
Signed-off-by: Dimitar Dobrev &lt;dpldobrev@protonmail.com&gt;
diff --git a/src/AST/CppTypePrinter.cs b/src/AST/CppTypePrinter.cs
@@ -65,7 +65,7 @@ private static string ConvertModifierToString(PointerType.TypeModifier modifier)
         {
             switch (modifier)
             {
-                case PointerType.TypeModifier.Value: return string.Empty;
+                case PointerType.TypeModifier.Value: return "[]";
                 case PointerType.TypeModifier.Pointer: return "*";
                 case PointerType.TypeModifier.LVReference: return "&";
                 case PointerType.TypeModifier.RVReference: return "&&";
diff --git a/src/Generator/Driver.cs b/src/Generator/Driver.cs
@@ -73,7 +73,7 @@ public void Setup()
         }
 
         public void SetupTypeMaps() =>
-            Context.TypeMaps = new TypeMapDatabase(Context.ASTContext, Options.GeneratorKind);
+            Context.TypeMaps = new TypeMapDatabase(Context.ASTContext, Options);
 
         void OnSourceFileParsed(IEnumerable<string> files, ParserResult result)
         {
diff --git a/src/Generator/Generators/CLI/CLIMarshal.cs b/src/Generator/Generators/CLI/CLIMarshal.cs
@@ -3,7 +3,6 @@
 using System.Text;
 using CppSharp.AST;
 using CppSharp.AST.Extensions;
-using CppSharp.Generators.CSharp;
 using CppSharp.Types;
 using Delegate = CppSharp.AST.Delegate;
 using Type = CppSharp.AST.Type;
@@ -22,7 +21,6 @@ public override bool VisitType(Type type, TypeQualifiers quals)
             TypeMap typeMap;
             if (Context.Context.TypeMaps.FindTypeMap(type, out typeMap) && typeMap.DoesMarshalling)
             {
-                typeMap.Type = type;
                 typeMap.CLIMarshalToManaged(Context);
                 return false;
             }
@@ -430,7 +428,6 @@ public override bool VisitType(Type type, TypeQualifiers quals)
             TypeMap typeMap;
             if (Context.Context.TypeMaps.FindTypeMap(type, out typeMap) && typeMap.DoesMarshalling)
             {
-                typeMap.Type = type;
                 typeMap.CLIMarshalToNative(Context);
                 return false;
             }
diff --git a/src/Generator/Generators/CLI/CLITypePrinter.cs b/src/Generator/Generators/CLI/CLITypePrinter.cs
@@ -25,7 +25,6 @@ public override TypePrinterResult VisitTagType(TagType tag, TypeQualifiers quals
             TypeMap typeMap = null;
             if (TypeMapDatabase.FindTypeMap(tag, out typeMap))
             {
-                typeMap.Type = tag;
                 var typePrinterContext = new TypePrinterContext { Type = tag };
                 return typeMap.CLISignatureType(typePrinterContext).ToString();
             }
@@ -225,7 +224,6 @@ public override TypePrinterResult VisitTemplateSpecializationType(
             TypeMap typeMap = null;
             if (TypeMapDatabase.FindTypeMap(template, out typeMap) && !typeMap.IsIgnored)
             {
-                typeMap.Type = template;
                 var typePrinterContext = new TypePrinterContext { Type = template };
                 return typeMap.CLISignatureType(typePrinterContext).ToString();
             }
diff --git a/src/Generator/Generators/CSharp/CSharpMarshal.cs b/src/Generator/Generators/CSharp/CSharpMarshal.cs
@@ -53,7 +53,6 @@ public override bool VisitType(Type type, TypeQualifiers quals)
             TypeMap typeMap;
             if (Context.Context.TypeMaps.FindTypeMap(type, out typeMap) && typeMap.DoesMarshalling)
             {
-                typeMap.Type = type;
                 typeMap.CSharpMarshalToManaged(Context);
                 return false;
             }
@@ -237,15 +236,6 @@ public override bool VisitPrimitiveType(PrimitiveType primitive, TypeQualifiers
             {
                 case PrimitiveType.Void:
                     return true;
-                case PrimitiveType.Char:
-                    // returned structs must be blittable and char isn't
-                    if (Context.Context.Options.MarshalCharAsManagedChar)
-                    {
-                        Context.Return.Write("global::System.Convert.ToChar({0})",
-                            Context.ReturnVarName);
-                        return true;
-                    }
-                    goto default;
                 case PrimitiveType.Bool:
                     if (Context.MarshalKind == MarshalKind.NativeField)
                     {
@@ -469,7 +459,6 @@ public override bool VisitType(Type type, TypeQualifiers quals)
             TypeMap typeMap;
             if (Context.Context.TypeMaps.FindTypeMap(type, out typeMap) && typeMap.DoesMarshalling)
             {
-                typeMap.Type = type;
                 typeMap.CSharpMarshalToNative(Context);
                 return false;
             }
@@ -727,15 +716,6 @@ public override bool VisitPrimitiveType(PrimitiveType primitive, TypeQualifiers
             {
                 case PrimitiveType.Void:
                     return true;
-                case PrimitiveType.Char:
-                    // returned structs must be blittable and char isn't
-                    if (Context.Context.Options.MarshalCharAsManagedChar)
-                    {
-                        Context.Return.Write("global::System.Convert.ToSByte({0})",
-                            Context.Parameter.Name);
-                        return true;
-                    }
-                    goto default;
                 case PrimitiveType.Bool:
                     if (Context.MarshalKind == MarshalKind.NativeField)
                     {
diff --git a/src/Generator/Passes/CheckDuplicatedNamesPass.cs b/src/Generator/Passes/CheckDuplicatedNamesPass.cs
@@ -106,13 +106,8 @@ public bool Equals(Parameter x, Parameter y)
                 // TODO: some target languages might make a difference between values and pointers
                 Type leftPointee = left.GetPointee();
                 Type rightPointee = right.GetPointee();
-                if ((leftPointee != null && leftPointee.Desugar(false).Equals(right)) ||
-                    (rightPointee != null && rightPointee.Desugar(false).Equals(left)))
-                    return true;
-
-                return TypePrinter != null &&
-                    left.IsPrimitiveType() && right.IsPrimitiveType() &&
-                    left.Visit(TypePrinter).Type == right.Visit(TypePrinter).Type;
+                return (leftPointee != null && leftPointee.Desugar(false).Equals(right)) ||
+                    (rightPointee != null && rightPointee.Desugar(false).Equals(left));
             }
 
             public int GetHashCode(Parameter obj)
diff --git a/src/Generator/Types/Std/Stdlib.cs b/src/Generator/Types/Std/Stdlib.cs
@@ -15,6 +15,72 @@ public class VaList : TypeMap
         public override bool IsIgnored => true;
     }
 
+    [TypeMap("char", GeneratorKind = GeneratorKind.CSharp)]
+    public class Char : TypeMap
+    {
+        public override Type CSharpSignatureType(TypePrinterContext ctx)
+        {
+            return new CILType(ctx.Kind == TypePrinterContextKind.Native ||
+                !Options.MarshalCharAsManagedChar ? typeof(sbyte) : typeof(char));
+        }
+
+        public override void CSharpMarshalToNative(CSharpMarshalContext ctx)
+        {
+            if (Options.MarshalCharAsManagedChar)
+                ctx.Return.Write("global::System.Convert.ToSByte({0})",
+               ctx.Parameter.Name);
+            else
+                ctx.Return.Write(ctx.Parameter.Name);
+        }
+
+        public override void CSharpMarshalToManaged(CSharpMarshalContext ctx)
+        {
+            if (Options.MarshalCharAsManagedChar)
+                ctx.Return.Write("global::System.Convert.ToChar({0})",
+                                   ctx.ReturnVarName);
+            else
+                ctx.Return.Write(ctx.ReturnVarName);
+        }
+    }
+
+    [TypeMap("char16_t", GeneratorKind = GeneratorKind.CSharp)]
+    public class Char16T : TypeMap
+    {
+        public override Type CSharpSignatureType(TypePrinterContext ctx)
+        {
+            return new CILType(typeof(char));
+        }
+
+        public override void CSharpMarshalToNative(CSharpMarshalContext ctx)
+        {
+            ctx.Return.Write(ctx.Parameter.Name);
+        }
+
+        public override void CSharpMarshalToManaged(CSharpMarshalContext ctx)
+        {
+            ctx.Return.Write(ctx.ReturnVarName);
+        }
+    }
+
+    [TypeMap("wchar_t", GeneratorKind = GeneratorKind.CSharp)]
+    public class WCharT : TypeMap
+    {
+        public override Type CSharpSignatureType(TypePrinterContext ctx)
+        {
+            return new CILType(typeof(char));
+        }
+
+        public override void CSharpMarshalToNative(CSharpMarshalContext ctx)
+        {
+            ctx.Return.Write(ctx.Parameter.Name);
+        }
+
+        public override void CSharpMarshalToManaged(CSharpMarshalContext ctx)
+        {
+            ctx.Return.Write(ctx.ReturnVarName);
+        }
+    }
+
     [TypeMap("basic_string<char, char_traits<char>, allocator<char>>")]
     public class String : TypeMap
     {
diff --git a/src/Generator/Types/TypeMap.cs b/src/Generator/Types/TypeMap.cs
@@ -1,7 +1,5 @@
 ﻿using System;
-using System.Collections.Generic;
 using CppSharp.AST;
-using CppSharp.AST.Extensions;
 using CppSharp.Generators;
 using CppSharp.Generators.AST;
 using CppSharp.Generators.CLI;
@@ -14,7 +12,7 @@ namespace CppSharp.Types
     [AttributeUsage(AttributeTargets.Class, AllowMultiple = true)]
     public class TypeMapAttribute : Attribute
     {
-        public string Type { get; private set; }
+        public string Type { get; }
         public GeneratorKind GeneratorKind { get; set; }
         
         public TypeMapAttribute(string type) : this(type, 0)
@@ -38,24 +36,19 @@ public class TypeMap
     {
         public Type Type { get; set; }
         public ASTContext ASTContext { get; set; }
+        public DriverOptions Options { get; set; }
         public ITypeMapDatabase TypeMapDatabase { get; set; }
 
         public bool IsEnabled { get; set; } = true;
 
-        public virtual bool IsIgnored
-        {
-            get { return false; }
-        }
+        public virtual bool IsIgnored => false;
 
-        public virtual bool IsValueType
-        {
-            get { return false; }
-        }
+        public virtual bool IsValueType => false;
 
         /// <summary>
         /// Determines if the type map performs marshalling or only injects custom code.
         /// </summary>
-        public virtual bool DoesMarshalling { get { return true; } }
+        public virtual bool DoesMarshalling => true;
 
         #region C# backend
 
diff --git a/src/Generator/Types/TypeMapDatabase.cs b/src/Generator/Types/TypeMapDatabase.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using CppSharp.AST;
 using CppSharp.AST.Extensions;
-using CppSharp.Generators;
 using Type = CppSharp.AST.Type;
 
 namespace CppSharp.Types
@@ -11,15 +10,18 @@ public class TypeMapDatabase : ITypeMapDatabase
     {
         public IDictionary<string, TypeMap> TypeMaps { get; set; }
 
-        public TypeMapDatabase(ASTContext astContext, GeneratorKind generatorKind)
+        public DriverOptions Options { get; }
+
+        public TypeMapDatabase(ASTContext astContext, DriverOptions options)
         {
             TypeMaps = new Dictionary<string, TypeMap>();
+            this.Options = options;
             foreach (var assembly in AppDomain.CurrentDomain.GetAssemblies())
             {
                 try
                 {
                     var types = assembly.FindDerivedTypes(typeof(TypeMap));
-                    SetupTypeMaps(types, generatorKind, astContext);
+                    SetupTypeMaps(types, astContext);
                 }
                 catch (System.Reflection.ReflectionTypeLoadException ex)
                 {
@@ -29,18 +31,18 @@ public TypeMapDatabase(ASTContext astContext, GeneratorKind generatorKind)
             }
         }
 
-        private void SetupTypeMaps(IEnumerable<System.Type> types,
-            GeneratorKind generatorKind, ASTContext astContext)
+        private void SetupTypeMaps(IEnumerable<System.Type> types, ASTContext astContext)
         {
             foreach (var type in types)
             {
                 var attrs = type.GetCustomAttributes(typeof(TypeMapAttribute), true);
                 foreach (TypeMapAttribute attr in attrs)
                 {
-                    if (attr.GeneratorKind == 0 || attr.GeneratorKind == generatorKind)
+                    if (attr.GeneratorKind == 0 || attr.GeneratorKind == Options.GeneratorKind)
                     {
                         var typeMap = (TypeMap) Activator.CreateInstance(type);
                         typeMap.ASTContext = astContext;
+                        typeMap.Options = Options;
                         typeMap.TypeMapDatabase = this;
                         this.TypeMaps[attr.Type] = typeMap;
                     }
@@ -108,10 +110,13 @@ public bool FindTypeMap(Type type, out TypeMap typeMap)
                 return typeMap.IsEnabled;
             }
 
+            Type desugared = type.Desugar();
+            bool printExtra = desugared.GetPointee() != null &&
+                desugared.GetFinalPointee().Desugar().IsPrimitiveType();
             var typePrinter = new CppTypePrinter
             {
-                PrintTypeQualifiers = false,
-                PrintTypeModifiers = false,
+                PrintTypeQualifiers = printExtra,
+                PrintTypeModifiers = printExtra,
                 PrintLogicalNames = true
             };
 

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ private static string ConvertModifierToString(PointerType.TypeModifier modifier)`
`65`	`65`	`{`
`66`	`66`	`switch (modifier)`
`67`	`67`	`{`
`68`		`- case PointerType.TypeModifier.Value: return string.Empty;`
	`68`	`+ case PointerType.TypeModifier.Value: return "[]";`
`69`	`69`	`case PointerType.TypeModifier.Pointer: return "*";`
`70`	`70`	`case PointerType.TypeModifier.LVReference: return "&";`
`71`	`71`	`case PointerType.TypeModifier.RVReference: return "&&";`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ public void Setup()`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`public void SetupTypeMaps() =>`
`76`		`- Context.TypeMaps = new TypeMapDatabase(Context.ASTContext, Options.GeneratorKind);`
	`76`	`+ Context.TypeMaps = new TypeMapDatabase(Context.ASTContext, Options);`
`77`	`77`
`78`	`78`	`void OnSourceFileParsed(IEnumerable<string> files, ParserResult result)`
`79`	`79`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@`
`3`	`3`	`using System.Text;`
`4`	`4`	`using CppSharp.AST;`
`5`	`5`	`using CppSharp.AST.Extensions;`
`6`		`-using CppSharp.Generators.CSharp;`
`7`	`6`	`using CppSharp.Types;`
`8`	`7`	`using Delegate = CppSharp.AST.Delegate;`
`9`	`8`	`using Type = CppSharp.AST.Type;`
`@@ -22,7 +21,6 @@ public override bool VisitType(Type type, TypeQualifiers quals)`
`22`	`21`	`TypeMap typeMap;`
`23`	`22`	`if (Context.Context.TypeMaps.FindTypeMap(type, out typeMap) && typeMap.DoesMarshalling)`
`24`	`23`	`{`
`25`		`- typeMap.Type = type;`
`26`	`24`	`typeMap.CLIMarshalToManaged(Context);`
`27`	`25`	`return false;`
`28`	`26`	`}`
`@@ -430,7 +428,6 @@ public override bool VisitType(Type type, TypeQualifiers quals)`
`430`	`428`	`TypeMap typeMap;`
`431`	`429`	`if (Context.Context.TypeMaps.FindTypeMap(type, out typeMap) && typeMap.DoesMarshalling)`
`432`	`430`	`{`
`433`		`- typeMap.Type = type;`
`434`	`431`	`typeMap.CLIMarshalToNative(Context);`
`435`	`432`	`return false;`
`436`	`433`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,6 @@ public override TypePrinterResult VisitTagType(TagType tag, TypeQualifiers quals`
`25`	`25`	`TypeMap typeMap = null;`
`26`	`26`	`if (TypeMapDatabase.FindTypeMap(tag, out typeMap))`
`27`	`27`	`{`
`28`		`- typeMap.Type = tag;`
`29`	`28`	`var typePrinterContext = new TypePrinterContext { Type = tag };`
`30`	`29`	`return typeMap.CLISignatureType(typePrinterContext).ToString();`
`31`	`30`	`}`
`@@ -225,7 +224,6 @@ public override TypePrinterResult VisitTemplateSpecializationType(`
`225`	`224`	`TypeMap typeMap = null;`
`226`	`225`	`if (TypeMapDatabase.FindTypeMap(template, out typeMap) && !typeMap.IsIgnored)`
`227`	`226`	`{`
`228`		`- typeMap.Type = template;`
`229`	`227`	`var typePrinterContext = new TypePrinterContext { Type = template };`
`230`	`228`	`return typeMap.CLISignatureType(typePrinterContext).ToString();`
`231`	`229`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@`
`2`	`2`	`using System.Collections.Generic;`
`3`	`3`	`using CppSharp.AST;`
`4`	`4`	`using CppSharp.AST.Extensions;`
`5`		`-using CppSharp.Generators;`
`6`	`5`	`using Type = CppSharp.AST.Type;`
`7`	`6`
`8`	`7`	`namespace CppSharp.Types`
`@@ -11,15 +10,18 @@ public class TypeMapDatabase : ITypeMapDatabase`
`11`	`10`	`{`
`12`	`11`	`public IDictionary<string, TypeMap> TypeMaps { get; set; }`
`13`	`12`
`14`		`- public TypeMapDatabase(ASTContext astContext, GeneratorKind generatorKind)`
	`13`	`+ public DriverOptions Options { get; }`
	`14`	`+`
	`15`	`+ public TypeMapDatabase(ASTContext astContext, DriverOptions options)`
`15`	`16`	`{`
`16`	`17`	`TypeMaps = new Dictionary<string, TypeMap>();`
	`18`	`+ this.Options = options;`
`17`	`19`	`foreach (var assembly in AppDomain.CurrentDomain.GetAssemblies())`
`18`	`20`	`{`
`19`	`21`	`try`
`20`	`22`	`{`
`21`	`23`	`var types = assembly.FindDerivedTypes(typeof(TypeMap));`
`22`		`- SetupTypeMaps(types, generatorKind, astContext);`
	`24`	`+ SetupTypeMaps(types, astContext);`
`23`	`25`	`}`
`24`	`26`	`catch (System.Reflection.ReflectionTypeLoadException ex)`
`25`	`27`	`{`
`@@ -29,18 +31,18 @@ public TypeMapDatabase(ASTContext astContext, GeneratorKind generatorKind)`
`29`	`31`	`}`
`30`	`32`	`}`
`31`	`33`
`32`		`- private void SetupTypeMaps(IEnumerable<System.Type> types,`
`33`		`- GeneratorKind generatorKind, ASTContext astContext)`
	`34`	`+ private void SetupTypeMaps(IEnumerable<System.Type> types, ASTContext astContext)`
`34`	`35`	`{`
`35`	`36`	`foreach (var type in types)`
`36`	`37`	`{`
`37`	`38`	`var attrs = type.GetCustomAttributes(typeof(TypeMapAttribute), true);`
`38`	`39`	`foreach (TypeMapAttribute attr in attrs)`
`39`	`40`	`{`
`40`		`- if (attr.GeneratorKind == 0 \|\| attr.GeneratorKind == generatorKind)`
	`41`	`+ if (attr.GeneratorKind == 0 \|\| attr.GeneratorKind == Options.GeneratorKind)`
`41`	`42`	`{`
`42`	`43`	`var typeMap = (TypeMap) Activator.CreateInstance(type);`
`43`	`44`	`typeMap.ASTContext = astContext;`
	`45`	`+ typeMap.Options = Options;`
`44`	`46`	`typeMap.TypeMapDatabase = this;`
`45`	`47`	`this.TypeMaps[attr.Type] = typeMap;`
`46`	`48`	`}`
`@@ -108,10 +110,13 @@ public bool FindTypeMap(Type type, out TypeMap typeMap)`
`108`	`110`	`return typeMap.IsEnabled;`
`109`	`111`	`}`
`110`	`112`
	`113`	`+ Type desugared = type.Desugar();`
	`114`	`+ bool printExtra = desugared.GetPointee() != null &&`
	`115`	`+ desugared.GetFinalPointee().Desugar().IsPrimitiveType();`
`111`	`116`	`var typePrinter = new CppTypePrinter`
`112`	`117`	`{`
`113`		`- PrintTypeQualifiers = false,`
`114`		`- PrintTypeModifiers = false,`
	`118`	`+ PrintTypeQualifiers = printExtra,`
	`119`	`+ PrintTypeModifiers = printExtra,`
`115`	`120`	`PrintLogicalNames = true`
`116`	`121`	`};`
`117`	`122`