Improved the detection of used template specialisations.

Signed-off-by: Dimitar Dobrev <dpldobrev@protonmail.com>

src/Generator/AST/Utils.cs

@@ -89,15 +89,11 @@ namespace CppSharp.AST
             ITypeMapDatabase typeMaps, bool internalOnly = false)
         {
             type = type.Desugar();
-            type = type.GetFinalPointee() ?? type;
+            type = (type.GetFinalPointee() ?? type).Desugar();
             ClassTemplateSpecialization specialization;
             type.TryGetDeclaration(out specialization);
-            if (specialization == null || specialization.IsExplicitlyGenerated)
+            if (specialization == null)
-            {
-                if (specialization != null)
-                    addSpecialization(specialization);
                 return;
-            }
 
             TypeMap typeMap;
             typeMaps.FindTypeMap(specialization, out typeMap);

src/Generator/Passes/IgnoreSystemDeclarationsPass.cs

@@ -1,4 +1,5 @@
-using System.Linq;
+using System.Collections.Generic;
+using System.Linq;
 using CppSharp.AST;
 using CppSharp.AST.Extensions;
 
@@ -43,7 +44,6 @@ namespace CppSharp.Passes
             if (!@class.TranslationUnit.IsSystemHeader)
                 return false;
 
-            if (!@class.IsExplicitlyGenerated)
             @class.ExplicitlyIgnore();
 
             if (!@class.IsDependent || @class.Specializations.Count == 0)
@@ -55,8 +55,8 @@ namespace CppSharp.Passes
                 case "basic_string":
                     foreach (var method in @class.Methods.Where(m => !m.IsDestructor && m.OriginalName != "c_str"))
                         method.ExplicitlyIgnore();
-                    var basicString = @class.Specializations.First(s =>
+                    foreach (var basicString in GetCharSpecializations(@class))
-                        s.Arguments[0].Type.Type.Desugar().IsPrimitiveType(PrimitiveType.Char));
+                    {
                         basicString.GenerationKind = GenerationKind.Generate;
                         foreach (var method in basicString.Methods)
                         {
@@ -75,14 +75,17 @@ namespace CppSharp.Passes
                                 method.ExplicitlyIgnore();
                             }
                         }
+                    }
                     break;
                 case "allocator":
                     foreach (var method in @class.Methods.Where(m => !m.IsConstructor || m.Parameters.Any()))
                         method.ExplicitlyIgnore();
-                    var allocator = @class.Specializations.First(s =>
+                    foreach (var allocator in GetCharSpecializations(@class))
-                        s.Arguments[0].Type.Type.Desugar().IsPrimitiveType(PrimitiveType.Char));
+                    {
                         allocator.GenerationKind = GenerationKind.Generate;
-                    foreach (var method in allocator.Methods.Where(m => !m.IsDestructor && m.OriginalName != "c_str"))
+                        foreach (var method in from method in allocator.Methods
+                                               where method.IsDestructor && method.OriginalName != "c_str"
+                                               select method)
                             method.ExplicitlyIgnore();
                         var ctor = allocator.Methods.Single(m => m.IsConstructor && !m.Parameters.Any());
                         ctor.GenerationKind = GenerationKind.Generate;
@@ -90,21 +93,29 @@ namespace CppSharp.Passes
                         ctor.InstantiatedFrom.Namespace.GenerationKind = GenerationKind.Generate;
                         foreach (var parameter in ctor.Parameters)
                             parameter.DefaultArgument = null;
+                    }
                     break;
                 case "char_traits":
                     foreach (var method in @class.Methods)
                         method.ExplicitlyIgnore();
-                    var charTraits = @class.Specializations.First(s =>
+                    foreach (var charTraits in GetCharSpecializations(@class))
-                        s.Arguments[0].Type.Type.Desugar().IsPrimitiveType(PrimitiveType.Char));
+                    {
                         foreach (var method in charTraits.Methods)
                             method.ExplicitlyIgnore();
                         charTraits.GenerationKind = GenerationKind.Generate;
                         charTraits.TemplatedDecl.TemplatedDecl.GenerationKind = GenerationKind.Generate;
+                    }
                     break;
             }
             return true;
         }
 
+        private static IEnumerable<ClassTemplateSpecialization> GetCharSpecializations(Class @class)
+        {
+            return @class.Specializations.Where(s =>
+                s.Arguments[0].Type.Type.Desugar().IsPrimitiveType(PrimitiveType.Char));
+        }
+
         public override bool VisitFunctionDecl(Function function)
         {
             if (!base.VisitFunctionDecl(function))

src/Generator/Passes/TrimSpecializationsPass.cs

@@ -100,8 +100,8 @@ namespace CppSharp.Passes
 
         private void CleanSpecializations(Class template)
         {
-            template.Specializations.RemoveAll(s => !s.IsExplicitlyGenerated
+            template.Specializations.RemoveAll(s => 
-                && !specializations.Contains(s) && !internalSpecializations.Contains(s));
+                !specializations.Contains(s) && !internalSpecializations.Contains(s));
 
             foreach (var specialization in template.Specializations.Where(
                 s => !s.IsExplicitlyGenerated &&