Abstract some `ASTConverterCodeGenerator` code

src/CppParser/Bootstrap/Bootstrap.cs

@@ -752,11 +752,14 @@ namespace CppSharp
 
     internal abstract class ASTConverterCodeGenerator : ManagedParserCodeGenerator
     {
-        readonly Enumeration StmtClassEnum;
+        public abstract string BaseTypeName { get; }
-        protected ASTConverterCodeGenerator(BindingContext context, IEnumerable<Declaration> declarations, Enumeration stmtClassEnum)
+        public string ParamName => BaseTypeName.ToLowerInvariant();
+
+        public abstract bool IsAbstractASTNode(Class kind);
+
+        protected ASTConverterCodeGenerator(BindingContext context, IEnumerable<Declaration> declarations)
             : base(context, declarations)
         {
-            StmtClassEnum = stmtClassEnum;
         }
 
         public override void Process()
@@ -765,6 +768,7 @@ namespace CppSharp
             NewLine();
 
             WriteLine("using CppSharp.Parser.AST;");
+            NewLine();
             WriteLine("using static CppSharp.ConversionUtils;");
             NewLine();
 
@@ -779,11 +783,9 @@ namespace CppSharp
             UnindentAndWriteCloseBrace();
         }
 
-        public virtual string BaseTypeName { get; }
+        protected abstract void GenerateVisitorSwitch(IEnumerable<string> classes);
 
-        public string ParamName => BaseTypeName.ToLowerInvariant();
+        protected virtual void GenerateVisitor()
-
-        private void GenerateVisitor()
         {
             var comment = new RawComment
             {
@@ -792,12 +794,13 @@ namespace CppSharp
 
             GenerateComment(comment);
 
-            WriteLine($"public abstract class {BaseTypeName}Visitor<TRet> where TRet : class");
+            WriteLine($"public abstract class {BaseTypeName}Visitor<TRet>");
+            WriteLineIndent("where TRet : class");
             WriteOpenBraceAndIndent();
 
             var classes = Declarations
                 .OfType<Class>()
-                .Where(@class => !IsAbstractStmt(@class))
+                .Where(@class => !IsAbstractASTNode(@class))
                 .Select(@class => @class.Name)
                 .ToArray();
 
@@ -812,62 +815,24 @@ namespace CppSharp
             WriteLineIndent("return default(TRet);");
             NewLine();
 
-            WriteLine($"switch({ParamName}.StmtClass)");
+            GenerateVisitorSwitch(classes);
-            WriteOpenBraceAndIndent();
-
-            var enumItems = StmtClassEnum != null ?
-                StmtClassEnum.Items.Where(item => item.IsGenerated)
-                    .Select(item => RemoveFromEnd(item.Name, "Class"))
-                    .Where(@class => !IsAbstractStmt(@class))
-                    : new List<string>();
-
-            GenerateSwitchCases(StmtClassEnum != null ? enumItems : classes);
 
             UnindentAndWriteCloseBrace();
             UnindentAndWriteCloseBrace();
-            UnindentAndWriteCloseBrace();
-        }
-
-        public virtual void GenerateSwitchCases(IEnumerable<string> classes)
-        {
-            foreach (var className in classes)
-            {
-                WriteLine($"case StmtClass.{className}:");
-                WriteOpenBraceAndIndent();
-
-                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();
-            }
-
-            WriteLine("default:");
-            WriteLineIndent($"throw new System.NotImplementedException(" +
-                $"{ParamName}.StmtClass.ToString());");
         }
 
         private void GenerateConverter()
         {
-            WriteLine("public unsafe class {0}Converter : {0}Visitor<AST.{0}>",
+            WriteLine("public unsafe class {0}Converter : {0}Visitor<AST.{0}>", BaseTypeName);
-                BaseTypeName);
             WriteOpenBraceAndIndent();
 
             foreach (var @class in Declarations.OfType<Class>())
             {
-                if (IsAbstractStmt(@class))
+                if (IsAbstractASTNode(@class))
                     continue;
 
                 PushBlock();
-                WriteLine("public override AST.{0} Visit{1}({1} {2})",
+                WriteLine("public override AST.{0} Visit{1}({1} {2})", BaseTypeName, @class.Name, ParamName);
-                    BaseTypeName, @class.Name, ParamName);
                 WriteOpenBraceAndIndent();
 
                 var qualifiedName = $"{GetQualifiedName(@class)}";
@@ -923,8 +888,7 @@ namespace CppSharp
         public override bool VisitMethodDecl(Method method)
         {
             var managedName = GetDeclName(method, GeneratorKind.CSharp);
-            var nativeName = CaseRenamePass.ConvertCaseString(method,
+            var nativeName = CaseRenamePass.ConvertCaseString(method, RenameCasePattern.LowerCamelCase);
-                RenameCasePattern.LowerCamelCase);
 
             WriteLine($"for (uint i = 0; i < {ParamName}.Get{nativeName}Count; i++)");
             WriteOpenBraceAndIndent();
@@ -942,7 +906,7 @@ namespace CppSharp
             return true;
         }
 
-        private void MarshalDecl(AST.Type type, string declTypeName, string bindingsName)
+        protected virtual void MarshalDecl(AST.Type type, string declTypeName, string bindingsName)
         {
             var typeName = $"AST.{declTypeName}";
             if (type.TryGetEnum(out Enumeration @enum))
@@ -975,8 +939,7 @@ namespace CppSharp
     {
         internal readonly IEnumerable<Declaration> Declarations;
 
-        public NativeParserCodeGenerator(BindingContext context,
+        public NativeParserCodeGenerator(BindingContext context, IEnumerable<Declaration> declarations)
-            IEnumerable<Declaration> declarations)
             : base(context)
         {
             Declarations = declarations;

src/CppParser/Bootstrap/StmtCodeGenerators.cs

@@ -445,13 +445,61 @@ namespace CppSharp
 
     internal class StmtASTConverterCodeGenerator : ASTConverterCodeGenerator
     {
-        public StmtASTConverterCodeGenerator(BindingContext context,
+        private readonly Enumeration StmtClassEnum;
-            IEnumerable<Declaration> declarations, Enumeration stmtClassEnum)
+
-            : base(context, declarations, stmtClassEnum)
+        public StmtASTConverterCodeGenerator(BindingContext context, IEnumerable<Declaration> declarations, Enumeration stmtClassEnum)
+            : base(context, declarations)
         {
+            StmtClassEnum = stmtClassEnum;
         }
 
         public override string BaseTypeName => "Stmt";
+
+        public override bool IsAbstractASTNode(Class kind)
+        {
+            return CodeGeneratorHelpers.IsAbstractStmt(kind);
+        }
+
+        protected override void GenerateVisitorSwitch(IEnumerable<string> classes)
+        {
+            WriteLine($"switch({ParamName}.StmtClass)");
+            WriteOpenBraceAndIndent();
+
+            var enumItems = StmtClassEnum != null ?
+                StmtClassEnum.Items.Where(item => item.IsGenerated)
+                    .Select(item => RemoveFromEnd(item.Name, "Class"))
+                    .Where(@class => !IsAbstractStmt(@class))
+                : new List<string>();
+
+            GenerateSwitchCases(StmtClassEnum != null ? enumItems : classes);
+
+            UnindentAndWriteCloseBrace();
+        }
+
+        private void GenerateSwitchCases(IEnumerable<string> classes)
+        {
+            foreach (var className in classes)
+            {
+                WriteLine($"case StmtClass.{className}:");
+                WriteOpenBraceAndIndent();
+
+                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();
+            }
+
+            WriteLine("default:");
+            WriteLineIndent($"throw new System.NotImplementedException({ParamName}.StmtClass.ToString());");
+        }
     }
 
     internal class ExprDeclarationsCodeGenerator : StmtDeclarationsCodeGenerator
@@ -513,7 +561,7 @@ namespace CppSharp
             "AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)";
     }
 
-    internal class ExprASTConverterCodeGenerator : ASTConverterCodeGenerator
+    internal class ExprASTConverterCodeGenerator : StmtASTConverterCodeGenerator
     {
         public ExprASTConverterCodeGenerator(BindingContext context,
             IEnumerable<Declaration> declarations)
@@ -522,5 +570,45 @@ namespace CppSharp
         }
 
         public override string BaseTypeName => "Expr";
+
+        public override bool IsAbstractASTNode(Class kind)
+        {
+            return CodeGeneratorHelpers.IsAbstractStmt(kind);
+        }
+
+        protected override void GenerateVisitorSwitch(IEnumerable<string> classes)
+        {
+            WriteLine($"switch({ParamName}.StmtClass)");
+            WriteOpenBraceAndIndent();
+
+            GenerateSwitchCases(classes);
+
+            UnindentAndWriteCloseBrace();
+        }
+
+        private void GenerateSwitchCases(IEnumerable<string> classes)
+        {
+            foreach (var className in classes)
+            {
+                WriteLine($"case StmtClass.{className}:");
+                WriteOpenBraceAndIndent();
+
+                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();
+            }
+
+            WriteLine("default:");
+            WriteLineIndent($"throw new System.NotImplementedException({ParamName}.StmtClass.ToString());");
+        }
     }
 }

src/Parser/ASTConverter.Expr.cs

@@ -6,6 +6,7 @@
 // ----------------------------------------------------------------------------
 
 using CppSharp.Parser.AST;
+
 using static CppSharp.ConversionUtils;
 
 namespace CppSharp
@@ -13,7 +14,8 @@ namespace CppSharp
     // <summary>
     // <para>Implements the visitor pattern for the generated expr bindings.</para>
     // </summary>
-    public abstract class ExprVisitor<TRet> where TRet : class
+    public abstract class ExprVisitor<TRet>
+        where TRet : class
     {
         public abstract TRet VisitConstantExpr(ConstantExpr expr);
         public abstract TRet VisitOpaqueValueExpr(OpaqueValueExpr expr);

src/Parser/ASTConverter.Stmt.cs

@@ -6,6 +6,7 @@
 // ----------------------------------------------------------------------------
 
 using CppSharp.Parser.AST;
+
 using static CppSharp.ConversionUtils;
 
 namespace CppSharp
@@ -13,7 +14,8 @@ namespace CppSharp
     // <summary>
     // <para>Implements the visitor pattern for the generated stmt bindings.</para>
     // </summary>
-    public abstract class StmtVisitor<TRet> where TRet : class
+    public abstract class StmtVisitor<TRet>
+        where TRet : class
     {
         public abstract TRet VisitDeclStmt(DeclStmt stmt);
         public abstract TRet VisitNullStmt(NullStmt stmt);