From beb3a377818c4877fe743acdd8727f123535b545 Mon Sep 17 00:00:00 2001
From: triton <ripzonetriton@gmail.com>
Date: Mon, 11 Mar 2013 03:07:00 +0000
Subject: [PATCH] Changed how the type ignore check visitor return results so
 it does not conflict with the AST visiting patterns.

---
 .../Passes/ResolveIncompleteDeclsPass.cs      |  8 ++-
 src/Generator/Types/Types.cs                  | 62 ++++++++++---------
 2 files changed, 38 insertions(+), 32 deletions(-)

diff --git a/src/Generator/Passes/ResolveIncompleteDeclsPass.cs b/src/Generator/Passes/ResolveIncompleteDeclsPass.cs
index fbb04f59..305613a2 100644
--- a/src/Generator/Passes/ResolveIncompleteDeclsPass.cs
+++ b/src/Generator/Passes/ResolveIncompleteDeclsPass.cs
@@ -168,13 +168,17 @@ namespace Cxxi.Passes
         bool IsTypeIgnored(Type type)
         {
             var checker = new TypeIgnoreChecker(typeMapDatabase);
-            return type.Visit(checker);
+            type.Visit(checker);
+
+            return checker.IsIgnored;
         }
 
         bool IsDeclIgnored(Declaration decl)
         {
             var checker = new TypeIgnoreChecker(typeMapDatabase);
-            return decl.Visit(checker);
+            decl.Visit(checker);
+
+            return checker.IsIgnored;
         }
 
         #endregion
diff --git a/src/Generator/Types/Types.cs b/src/Generator/Types/Types.cs
index b3c1d3c5..2e800422 100644
--- a/src/Generator/Types/Types.cs
+++ b/src/Generator/Types/Types.cs
@@ -56,60 +56,61 @@ namespace Cxxi
     public class TypeIgnoreChecker : AstVisitor
     {
         ITypeMapDatabase TypeMapDatabase { get; set; }
+        public bool IsIgnored;
 
         public TypeIgnoreChecker(ITypeMapDatabase database)
         {
             TypeMapDatabase = database;
+            IsIgnored = false;
         }
 
-        public override bool VisitDeclaration(Declaration decl)
+        void Ignore()
         {
-            return decl.Ignore;
+            IsIgnored = true;
         }
 
-        public override bool VisitBuiltinType(BuiltinType builtin, TypeQualifiers quals)
+        public override bool VisitDeclaration(Declaration decl)
         {
-            return false;
+            if (decl.Ignore)
+                Ignore();
+
+            return true;
         }
 
-        public override bool VisitFunctionType(FunctionType function, TypeQualifiers quals)
+        public override bool VisitClassDecl(Class @class)
         {
-            if (!function.ReturnType.Visit(this))
+            if (AlreadyVisited(@class))
                 return false;
 
-            foreach (var arg in function.Arguments)
-            {
-                if (!arg.Type.Visit(this))
-                    return false;
-            }
-
+            VisitDeclaration(@class);
             return true;
         }
 
-        public override bool VisitFunctionDecl(Function function)
+        public override bool VisitTypedefType(TypedefType typedef,
+            TypeQualifiers quals)
         {
-            if (!function.ReturnType.Visit(this))
-                return false;
-
-            foreach (var param in function.Parameters)
+            TypeMap typeMap = null;
+            if (TypeMapDatabase.FindTypeMap(typedef, out typeMap)
+                && typeMap.IsIgnored)
             {
-                if (!param.Visit(this))
-                    return false;
+                Ignore();
+                return false;
             }
 
-            return true;
+            return base.VisitTypedefType(typedef, quals);
         }
 
-        public override bool VisitTypedefType(TypedefType typedef,
-            TypeQualifiers quals)
+        public override bool VisitTypedefDecl(TypedefDecl typedef)
         {
-            var decl = typedef.Declaration;
-
             TypeMap typeMap = null;
-            if (TypeMapDatabase.FindTypeMap(decl, out typeMap))
-                return typeMap.IsIgnored;
+            if (TypeMapDatabase.FindTypeMap(typedef, out typeMap)
+                && typeMap.IsIgnored)
+            {
+                Ignore();
+                return false;
+            }
 
-            return base.VisitTypedefType(typedef, quals);
+            return base.VisitTypedefDecl(typedef);
         }
 
         public override bool VisitTemplateSpecializationType(
@@ -118,10 +119,11 @@ namespace Cxxi
             var decl = template.Template.TemplatedDecl;
 
             TypeMap typeMap = null;
-            if (TypeMapDatabase.FindTypeMap(decl, out typeMap))
+            if (TypeMapDatabase.FindTypeMap(decl, out typeMap)
+                && typeMap.IsIgnored)
             {
-                if (typeMap.IsIgnored)
-                    return true;
+                Ignore();
+                return false;
             }
 
             return base.VisitTemplateSpecializationType(template, quals);