Abstraction improvements

src/CppParser/Bootstrap/Bootstrap.cs

@@ -381,7 +381,7 @@ namespace CppSharp
                         @class.Properties.Add(property);
                 }
 
-                if (@base.Class.Name == "APFloatStorage")
+                else if (@base.Class.Name == "APFloatStorage")
                 {
                     @base.ExplicitlyIgnore();
 
@@ -996,5 +996,114 @@ namespace CppSharp
         }
     }
 
+    internal abstract class DefinitionsCodeGenerator : NativeParserCodeGenerator
+    {
+        protected DefinitionsCodeGenerator(BindingContext context, IEnumerable<Declaration> declarations)
+            : base(context, declarations)
+        {
+        }
+
+        public abstract string BaseTypeName { get; }
+        public string ParamName => BaseTypeName.ToLowerInvariant();
+
+        public override bool GeneratePragmaOnce => false;
+
+        public virtual void GenerateDefinitions()
+        {
+            Process();
+
+            GenerateIncludes();
+            NewLine();
+
+            WriteLine("namespace CppSharp::CppParser::AST {");
+            NewLine();
+
+            foreach (var decl in Declarations.OfType<Class>())
+                decl.Visit(this);
+
+            WriteLine("}");
+        }
+
+        public virtual void GenerateIncludes()
+        {
+            GenerateCommonIncludes();
+        }
+
+        protected virtual string GenerateInit(Property property)
+        {
+            if (property.Type.IsPointer())
+                return "nullptr";
+
+            if (property.Type.IsPrimitiveType(PrimitiveType.Bool))
+                return "false";
+
+            var typeName = GetDeclTypeName(property);
+            if (property.Type.TryGetClass(out Class _))
+                return $"{typeName}()";
+
+            if (property.Type.TryGetEnum(out Enumeration @enum))
+                return $"{GetQualifiedName(@enum)}::{@enum.Items.First().Name}";
+
+            return "0";
+        }
+
+        protected virtual void GenerateMemberInits(Class @class)
+        {
+            foreach (var property in @class.Properties)
+            {
+                if (SkipProperty(property))
+                    continue;
+
+                var typeName = GetDeclTypeName(property);
+                if (typeName == "std::string")
+                    continue;
+
+                WriteLineIndent($", {GetDeclName(property)}({GenerateInit(property)})");
+            }
+        }
+
+        public override bool VisitEnumDecl(Enumeration @enum)
+        {
+            return true;
+        }
+    }
+
+    internal abstract class DeclarationsCodeGenerator : NativeParserCodeGenerator
+    {
+        protected DeclarationsCodeGenerator(BindingContext context, IEnumerable<Declaration> declarations)
+            : base(context, declarations)
+        {
+        }
+
+        public abstract string BaseTypeName { get; }
+        public string ParamName => BaseTypeName.ToLowerInvariant();
+
+        public virtual void GenerateDeclarations()
+        {
+            Process();
+            GenerateIncludes();
+            NewLine();
+
+            WriteLine("namespace CppSharp::CppParser::AST {");
+            NewLine();
+
+            GenerateForwardDecls();
+            NewLine();
+
+            foreach (var decl in Declarations)
+                decl.Visit(this);
+
+            NewLine();
+            WriteLine("}");
+        }
+
+        public virtual void GenerateIncludes()
+        {
+            WriteInclude("Sources.h", CInclude.IncludeKind.Quoted);
+            WriteInclude("Types.h", CInclude.IncludeKind.Quoted);
+        }
+
+        public virtual void GenerateForwardDecls() { }
+    }
     #endregion
 }

src/CppParser/Bootstrap/StmtCodeGenerators.cs

@@ -12,28 +12,20 @@ using static CppSharp.CodeGeneratorHelpers;
 
 namespace CppSharp
 {
-    internal class StmtDeclarationsCodeGenerator : NativeParserCodeGenerator
+    internal class StmtDeclarationsCodeGenerator : DeclarationsCodeGenerator
     {
-        public StmtDeclarationsCodeGenerator(BindingContext context,
+        public StmtDeclarationsCodeGenerator(BindingContext context, IEnumerable<Declaration> declarations)
-            IEnumerable<Declaration> declarations)
             : base(context, declarations)
         {
         }
 
-        public void GenerateDeclarations()
+        public override string BaseTypeName => "Stmt";
-        {
-            Process();
-            GenerateIncludes();
-            NewLine();
-
-            WriteLine("namespace CppSharp::CppParser::AST {");
-            NewLine();
-
-            GenerateForwardDecls();
-            NewLine();
 
-            foreach (var decl in Declarations)
+        public override bool VisitDeclaration(Declaration decl)
         {
+            if (!base.VisitDeclaration(decl))
+                return false;
+
             if (decl.Name == "GCCAsmStmt")
             {
                 WriteLine("class StringLiteral;");
@@ -41,20 +33,10 @@ namespace CppSharp
                 NewLine();
             }
 
-                decl.Visit(this);
+            return true;
-            }
-
-            NewLine();
-            WriteLine("}");
-        }
-
-        public virtual void GenerateIncludes()
-        {
-            WriteInclude("Sources.h", CInclude.IncludeKind.Quoted);
-            WriteInclude("Types.h", CInclude.IncludeKind.Quoted);
         }
 
-        public virtual void GenerateForwardDecls()
+        public override void GenerateForwardDecls()
         {
             WriteLine("class Expr;");
             WriteLine("class Declaration;");
@@ -103,33 +85,16 @@ namespace CppSharp
         }
     }
 
-    internal class StmtDefinitionsCodeGenerator : NativeParserCodeGenerator
+    internal class StmtDefinitionsCodeGenerator : DefinitionsCodeGenerator
     {
-        public StmtDefinitionsCodeGenerator(BindingContext context,
+        public StmtDefinitionsCodeGenerator(BindingContext context, IEnumerable<Declaration> declarations)
-            IEnumerable<Declaration> declarations)
             : base(context, declarations)
         {
         }
 
-        public override bool GeneratePragmaOnce => false;
+        public override string BaseTypeName => "Stmt";
-
-        public void GenerateDefinitions()
-        {
-            Process();
-
-            GenerateIncludes();
-            NewLine();
-
-            WriteLine("namespace CppSharp::CppParser::AST {");
-            NewLine();
-
-            foreach (var decl in Declarations.OfType<Class>())
-                decl.Visit(this);
-
-            WriteLine("}");
-        }
 
-        public virtual void GenerateIncludes()
+        public override void GenerateIncludes()
         {
             GenerateCommonIncludes();
             WriteInclude("Stmt.h", CInclude.IncludeKind.Quoted);
@@ -185,44 +150,6 @@ namespace CppSharp
 
             return true;
         }
-
-        internal void GenerateMemberInits(Class @class)
-        {
-            foreach (var property in @class.Properties)
-            {
-                if (SkipProperty(property))
-                    continue;
-
-                var typeName = GetDeclTypeName(property);
-                if (typeName == "std::string")
-                    continue;
-
-                WriteLineIndent($", {GetDeclName(property)}({GenerateInit(property)})");
-            }
-        }
-
-        private string GenerateInit(Property property)
-        {
-            if (property.Type.IsPointer())
-                return "nullptr";
-
-            if (property.Type.IsPrimitiveType(PrimitiveType.Bool))
-                return "false";
-
-            var typeName = GetDeclTypeName(property);
-            if (property.Type.TryGetClass(out Class _))
-                return $"{typeName}()";
-
-            if (property.Type.TryGetEnum(out Enumeration @enum))
-                return $"{GetQualifiedName(@enum)}::{@enum.Items.First().Name}";
-
-            return "0";
-        }
-
-        public override bool VisitEnumDecl(Enumeration @enum)
-        {
-            return true;
-        }
     }
 
     internal class StmtParserCodeGenerator : NativeParserCodeGenerator
@@ -469,9 +396,9 @@ namespace CppSharp
                 StmtClassEnum.Items.Where(item => item.IsGenerated)
                     .Select(item => RemoveFromEnd(item.Name, "Class"))
                     .Where(@class => !IsAbstractStmt(@class))
-                : new List<string>();
+                : classes;
 
-            GenerateSwitchCases(StmtClassEnum != null ? enumItems : classes);
+            GenerateSwitchCases(enumItems);
 
             UnindentAndWriteCloseBrace();
         }
@@ -510,6 +437,8 @@ namespace CppSharp
         {
         }
 
+        public override string BaseTypeName => "Expr";
+
         public override void GenerateIncludes()
         {
             WriteInclude("Stmt.h", CInclude.IncludeKind.Quoted);
@@ -532,7 +461,7 @@ namespace CppSharp
         {
         }
 
-        public override bool GeneratePragmaOnce => false;
+        public override string BaseTypeName => "Expr";
 
         public override void GenerateIncludes()
         {
@@ -563,8 +492,7 @@ namespace CppSharp
 
     internal class ExprASTConverterCodeGenerator : StmtASTConverterCodeGenerator
     {
-        public ExprASTConverterCodeGenerator(BindingContext context,
+        public ExprASTConverterCodeGenerator(BindingContext context, IEnumerable<Declaration> declarations)
-            IEnumerable<Declaration> declarations)
             : base(context, declarations, null)
         {
         }
@@ -595,13 +523,6 @@ namespace CppSharp
 
                 WriteLine($"var _{ParamName} = {className}.__CreateInstance({ParamName}.__Instance);");
 
-                var isExpression = Declarations
-                    .OfType<Class>()
-                    .All(c => c.Name != className);
-
-                if (isExpression)
-                    WriteLine($"return VisitExpression(_{ParamName} as Expr) as TRet;");
-                else
                 WriteLine($"return Visit{className}(_{ParamName});");
 
                 UnindentAndWriteCloseBrace();