From b091a0370ae0feabaca073608b9244373b7cb31a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joa=CC=83o=20Matos?= <joao@tritao.eu>
Date: Sun, 5 Apr 2020 18:22:11 +0100
Subject: [PATCH] Extract and rework type map finding code from VisitTagType in
 C++ type printer.

---
 src/Generator/Generators/C/CppTypePrinter.cs | 45 ++++++++++++++++----
 1 file changed, 37 insertions(+), 8 deletions(-)

diff --git a/src/Generator/Generators/C/CppTypePrinter.cs b/src/Generator/Generators/C/CppTypePrinter.cs
index b74485ea..a51c30fb 100644
--- a/src/Generator/Generators/C/CppTypePrinter.cs
+++ b/src/Generator/Generators/C/CppTypePrinter.cs
@@ -38,17 +38,46 @@ namespace CppSharp.Generators.C
         public bool ResolveTypeMaps { get; set; } = true;
         public bool ResolveTypedefs { get; set; }
 
-        public override TypePrinterResult VisitTagType(TagType tag,
-            TypeQualifiers quals)
+        public bool FindTypeMap(CppSharp.AST.Type type, out TypePrinterResult result)
         {
+            result = null;
+
+            if (!ResolveTypeMaps)
+                return false;
+
             TypeMap typeMap;
-            if (ResolveTypeMaps && TypeMapDatabase.FindTypeMap(tag, out typeMap) &&
-                !typeMap.IsIgnored)
+            if (!TypeMapDatabase.FindTypeMap(type, out typeMap) || typeMap.IsIgnored)
+                return false;
+
+            var typePrinterContext = new TypePrinterContext
             {
-                var typePrinterContext = new TypePrinterContext { Type = tag };
-                var type = typeMap.CppSignatureType(typePrinterContext).ToString();
-                return new TypePrinterResult(type) { TypeMap = typeMap };
-            }
+                Type = type,
+                Kind = Kind,
+                MarshalKind = MarshalKind
+            };
+
+            var typePrinter = new CppTypePrinter(Context)
+            {
+                PrintFlavorKind = PrintFlavorKind,
+                ScopeKind = ScopeKind,
+                PrintTypeQualifiers = PrintTypeQualifiers,
+                PrintTypeModifiers = PrintTypeModifiers,
+                ResolveTypeMaps = false
+            };
+            typePrinter.PushContext(ContextKind);
+
+            var typeName = typeMap.CppSignatureType(typePrinterContext).Visit(typePrinter);
+            result = new TypePrinterResult(typeName) { TypeMap = typeMap };
+
+            return true;
+        }
+
+        public override TypePrinterResult VisitTagType(TagType tag,
+            TypeQualifiers quals)
+        {
+            TypePrinterResult result;
+            if (FindTypeMap(tag, out result))
+                return result;
 
             var qual = GetStringQuals(quals);
             return $"{qual}{tag.Declaration.Visit(this)}";