Changes in src/CodeGen/Generate.cc [0dd18fd:a984e65]

File:

• src/CodeGen/Generate.cc (modified) (3 diffs)

src/CodeGen/Generate.cc

@@ -21 +21 @@
 #include "CodeGenerator.h"           // for CodeGenerator, doSemicolon, oper...
 #include "GenType.h"                 // for genPrettyType
+#include "Common/PassVisitor.h"      // for PassVisitor
 #include "Parser/LinkageSpec.h"      // for isBuiltin, isGeneratable
 #include "SynTree/BaseSyntaxNode.h"  // for BaseSyntaxNode
@@ -29 +30 @@
 
 namespace CodeGen {
+        namespace {
+                /// Removes misc. nodes that should not exist in CodeGen
+                struct TreeCleaner {
+                        void visit( CompoundStmt * stmt );
+
+                        static bool shouldClean( Declaration * );
+                };
+
+                void cleanTree( std::list< Declaration * > & translationUnit ) {
+                        PassVisitor<TreeCleaner> cleaner;
+                        filter( translationUnit, [](Declaration * decl) { return TreeCleaner::shouldClean(decl); }, false );
+                        acceptAll( translationUnit, cleaner );
+                } // cleanTree
+        } // namespace
+
         void generate( std::list< Declaration* > translationUnit, std::ostream &os, bool doIntrinsics, bool pretty, bool generateC, bool lineMarks ) {
+                cleanTree( translationUnit );
+
                 CodeGen::CodeGenerator cgv( os, pretty, generateC, lineMarks );
                 for ( auto & dcl : translationUnit ) {
@@ -52 +70 @@
                 os << std::endl;
         }
+
+        namespace {
+                void TreeCleaner::visit( CompoundStmt * cstmt ) {
+                        filter( cstmt->kids, [](Statement * stmt) {
+                                if ( DeclStmt * declStmt = dynamic_cast< DeclStmt * >( stmt ) ) {
+                                        return shouldClean( declStmt->decl );
+                                }
+                                return false;
+                        }, false );
+                }
+
+                bool TreeCleaner::shouldClean( Declaration * decl ) {
+                        return dynamic_cast< TraitDecl * >( decl );
+                }
+        } // namespace
 } // namespace CodeGen