Changes in src/CodeGen/Generate.cc [a54840b:9857e8d]

File:

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

src/CodeGen/Generate.cc

@@ -33 +33 @@
                 /// Removes misc. nodes that should not exist in CodeGen
                 struct TreeCleaner {
-                        void previsit( CompoundStmt * stmt );
+                        void premutate( CompoundStmt * stmt );
+                        Statement * postmutate( ImplicitCtorDtorStmt * stmt );
 
                         static bool shouldClean( Declaration * );
@@ -41 +42 @@
                         PassVisitor<TreeCleaner> cleaner;
                         filter( translationUnit, [](Declaration * decl) { return TreeCleaner::shouldClean(decl); }, false );
-                        acceptAll( translationUnit, cleaner );
+                        mutateAll( translationUnit, cleaner );
                 } // cleanTree
         } // namespace
@@ -48 +49 @@
                 cleanTree( translationUnit );
 
-                CodeGen::CodeGenerator cgv( os, pretty, generateC, lineMarks );
+                PassVisitor<CodeGenerator> cgv( os, pretty, generateC, lineMarks );
                 for ( auto & dcl : translationUnit ) {
                         if ( LinkageSpec::isGeneratable( dcl->get_linkage() ) && (doIntrinsics || ! LinkageSpec::isBuiltin( dcl->get_linkage() ) ) ) {
-                                cgv.updateLocation( dcl );
+                                cgv.pass.updateLocation( dcl );
                                 dcl->accept(cgv);
                                 if ( doSemicolon( dcl ) ) {
@@ -65 +66 @@
                         os << CodeGen::genPrettyType( type, "" );
                 } else {
-                        CodeGen::CodeGenerator cgv( os, true, false, false );
+                        PassVisitor<CodeGenerator> cgv( os, true, false, false );
                         node->accept( cgv );
                 }
@@ -72 +73 @@
 
         namespace {
-                void TreeCleaner::previsit( CompoundStmt * cstmt ) {
+                void TreeCleaner::premutate( CompoundStmt * cstmt ) {
                         filter( cstmt->kids, [](Statement * stmt) {
                                 if ( DeclStmt * declStmt = dynamic_cast< DeclStmt * >( stmt ) ) {
@@ -79 +80 @@
                                 return false;
                         }, false );
+                }
+
+                Statement * TreeCleaner::postmutate( ImplicitCtorDtorStmt * stmt ) {
+                        Statement * callStmt = nullptr;
+                        std::swap( stmt->callStmt, callStmt );
+                        delete stmt;
+                        return callStmt;
                 }