Fixed type map support for typedef types.

Fixes #1205.

Author: tritao

src/AST/Type.cs

@@ -438,7 +438,11 @@ public override object Clone()
         public override bool Equals(object obj)
         {
             var typedef = obj as TypedefType;
-            return Declaration.Type.Equals(typedef == null ? obj : typedef.Declaration.Type);
+            if (typedef == null)
+                return false;
+
+            return Declaration.OriginalName == typedef.Declaration.OriginalName &&
+                   Declaration.Type.Equals(typedef.Declaration.Type);
         }
 
         public override int GetHashCode() =>

src/Generator/Generators/CSharp/CSharpTypePrinter.cs

@@ -253,7 +253,7 @@ public override TypePrinterResult VisitTypedefType(TypedefType typedef,
             var decl = typedef.Declaration;
 
             TypeMap typeMap;
-            if (TypeMapDatabase.FindTypeMap(decl.Type, out typeMap))
+            if (TypeMapDatabase.FindTypeMap(typedef, out typeMap))
             {
                 typeMap.Type = typedef;
 

src/Generator/Types/TypeMapDatabase.cs

@@ -93,7 +93,7 @@ public bool FindTypeMap(Type type, out TypeMap typeMap)
                 PrintLogicalNames = true
             };
 
-            foreach (var resolveTypeDefs in new[] { true, false })
+            foreach (var resolveTypeDefs in new[] { false, true })
             {
                 foreach (var typePrintScopeKind in
                     new[] { TypePrintScopeKind.Local, TypePrintScopeKind.Qualified })

tests/CSharp/CSharp.Tests.cs

@@ -1285,4 +1285,10 @@ private class OverrideVirtualTemplate : VirtualTemplate<int>
     {
         public override int Function() => 10;
     }
+
+    [Test]
+    public void TestTypemapTypedefParam()
+    {
+        Assert.That(CSharp.CSharp.TakeTypemapTypedefParam(false), Is.False);
+    }
 }

tests/CSharp/CSharp.cpp

@@ -1564,3 +1564,8 @@ const char*& takeConstCharStarRef(const char*& c)
 {
     return c;
 }
+
+boolean_t takeTypemapTypedefParam(boolean_t b)
+{
+    return b;
+}

tests/CSharp/CSharp.cs

@@ -95,6 +95,24 @@ public override bool VisitFunctionDecl(Function function)
     }
 
     #region Type Maps
+    [TypeMap("boolean_t")]
+    public class BooleanTypeMap : TypeMap
+    {
+        public override Type CSharpSignatureType(TypePrinterContext ctx)
+        {
+            return new BuiltinType(PrimitiveType.Bool);
+        }
+
+        public override void CSharpMarshalToNative(CSharpMarshalContext ctx)
+        {
+            ctx.Return.Write(ctx.Parameter.Name);
+        }
+
+        public override void CSharpMarshalToManaged(CSharpMarshalContext ctx)
+        {
+            ctx.Return.Write(ctx.ReturnVarName);
+        }
+    }
 
     [TypeMap("QFlags")]
     public class QFlags : TypeMap

tests/CSharp/CSharp.h

@@ -1321,3 +1321,7 @@ struct {
         } example;
     } root;
 } kotlin;
+
+typedef int boolean_t;
+DLL_API boolean_t takeTypemapTypedefParam(boolean_t b);
+