Resolved ambiguity between char-like types in the generated C#.

Signed-off-by: Dimitar Dobrev <[email protected]>

Author: ddobrev

src/Generator/Passes/CheckDuplicatedNamesPass.cs

@@ -3,6 +3,9 @@
 using System.Linq;
 using CppSharp.AST;
 using CppSharp.AST.Extensions;
+using CppSharp.Generators;
+using CppSharp.Generators.CLI;
+using CppSharp.Generators.CSharp;
 
 namespace CppSharp.Passes
 {
@@ -100,32 +103,35 @@ public static string FixSignatureForConversions(Function function, string signat
             return signature;
         }
 
-        private class ParameterTypeComparer : IEqualityComparer<Parameter>
+        public class ParameterTypeComparer : IEqualityComparer<Parameter>
         {
             public static readonly ParameterTypeComparer Instance = new ParameterTypeComparer();
 
-            private ParameterTypeComparer()
-            {
-            }
-
             public bool Equals(Parameter x, Parameter y)
             {
                 Type left = x.Type.Desugar(resolveTemplateSubstitution: false);
                 Type right = y.Type.Desugar(resolveTemplateSubstitution: false);
                 if (left.Equals(right))
                     return true;
 
-                // TODO: some target languages might maek a difference between values and pointers
+                // TODO: some target languages might make a difference between values and pointers
                 Type leftPointee = left.GetPointee();
                 Type rightPointee = right.GetPointee();
-                return (leftPointee != null && leftPointee.Desugar(false).Equals(right)) ||
-                    (rightPointee != null && rightPointee.Desugar(false).Equals(left));
+                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;
             }
 
             public int GetHashCode(Parameter obj)
             {
                 return obj.Type.GetHashCode();
             }
+
+            public static TypePrinter TypePrinter { get; set; }
         }
     }
 
@@ -139,6 +145,22 @@ public CheckDuplicatedNamesPass()
             names = new Dictionary<string, DeclarationName>();
         }
 
+        public override bool VisitASTContext(ASTContext context)
+        {
+            TypePrinter typePrinter = null;
+            switch (Options.GeneratorKind)
+            {
+                case GeneratorKind.CLI:
+                    typePrinter = new CLITypePrinter(Context);
+                    break;
+                case GeneratorKind.CSharp:
+                    typePrinter = new CSharpTypePrinter(Context);
+                    break;
+            }
+            DeclarationName.ParameterTypeComparer.TypePrinter = typePrinter;
+            return base.VisitASTContext(context);
+        }
+
         public override bool VisitProperty(Property decl)
         {
             if (!VisitDeclaration(decl))

tests/CSharp/CSharp.cpp

@@ -14,6 +14,14 @@ Foo::Foo(int a, int p) : publicFieldMappedToEnum(TestFlag::Flag2)
     P = p;
 }
 
+Foo::Foo(char16_t ch)
+{
+}
+
+Foo::Foo(wchar_t ch)
+{
+}
+
 int Foo::method()
 {
     return 1;

tests/CSharp/CSharp.h

@@ -13,6 +13,8 @@ class DLL_API Foo
 public:
     Foo(const char* name = 0);
     Foo(int a, int p = 0);
+    Foo(char16_t ch);
+    Foo(wchar_t ch);
     int method();
     int operator[](int i) const;
     int operator[](unsigned int i);