Changes in src/ControlStruct/HoistControlDecls.cpp [45040b61:a488783]

File:

• src/ControlStruct/HoistControlDecls.cpp (modified) (2 diffs)

src/ControlStruct/HoistControlDecls.cpp

@@ -9 +9 @@
 // Author           : Andrew Beach
 // Created On       : Fri Dec  3 15:34:00 2021
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jan 31 18:52:35 2022
-// Update Count     : 23
+// Last Modified By : Andrew Beach
+// Last Modified On : Fri Dec  3 15:34:00 2021
+// Update Count     : 0
 //
 
@@ -19 +19 @@
 #include "AST/Pass.hpp"
 #include "AST/TranslationUnit.hpp"
-using namespace ast;
 
 namespace ControlStruct {
 
+namespace {
+
 template<typename StmtT>
-const Stmt * hoist( const StmtT * stmt ) {
+const ast::Stmt * hoist( const StmtT * stmt ) {
         // If no hoisting is needed, then make no changes.
+        if ( 0 == stmt->inits.size() ) {
+                return stmt;
+        }
 
-        if ( stmt->inits.size() == 0 ) {                                        // no declarations ?
-                // if ( /* no conditional declarations */ ...  ) ...
-                return stmt;
-        } // if
-
-        // Put hoist declarations and modified statement in a compound statement.
-
-        CompoundStmt * block = new CompoundStmt( stmt->location ); // create empty compound statement
-        //    {
-        //    }
-
-        for ( const Stmt * next : stmt->inits ) {                       // link conditional declarations into compound
+        // Put initializers and the old statement in the compound statement.
+        ast::CompoundStmt * block = new ast::CompoundStmt( stmt->location );
+        StmtT * mutStmt = ast::mutate( stmt );
+        for ( const ast::Stmt * next : mutStmt->inits ) {
                 block->kids.push_back( next );
         }
-        //    if ( int x = f(), y = g(); ... ) ...
-        // link declarations into compound statement
-        //    {
-        //         int x = f();
-        //         int y = g();
-        //    }
-
-        StmtT * mutStmt = mutate( stmt );                                       // create mutate handle to change statement
-        mutStmt->inits.clear();                                                         // remove declarations
-        //    if ( ... ) ...
-
-        block->kids.push_back( mutStmt );                                       // link modified statement into compound
-        //    {
-        //        int x = f();
-        //        int y = g();
-        //        if ( ... ) ...
-        //    }
+        mutStmt->inits.clear();
+        block->kids.push_back( mutStmt );
         return block;
 }
 
-struct hoistControlDeclsCore {
-        // Statements with declarations in conditional.
-        const Stmt * postvisit( const IfStmt * stmt ) {
-                return hoist<IfStmt>( stmt );
+struct HoistControlCore {
+        const ast::Stmt * postvisit( const ast::IfStmt * stmt ) {
+                return hoist<ast::IfStmt>( stmt );
         }
-        const Stmt * postvisit( const ForStmt * stmt ) {
-                return hoist<ForStmt>( stmt );
+        const ast::Stmt * postvisit( const ast::ForStmt * stmt ) {
+                return hoist<ast::ForStmt>( stmt );
         }
-        const Stmt * postvisit( const WhileStmt * stmt ) {
-                return hoist<WhileStmt>( stmt );
+        const ast::Stmt * postvisit( const ast::WhileStmt * stmt ) {
+                return hoist<ast::WhileStmt>( stmt );
         }
 };
 
-// Hoist initialization out of for statements.
-void hoistControlDecls( TranslationUnit & translationUnit ) {
-        Pass<hoistControlDeclsCore>::run( translationUnit );
+} // namespace
+
+/// Hoist initialization out of for statements.
+void hoistControlDecls( ast::TranslationUnit & translationUnit ) {
+        ast::Pass<HoistControlCore>::run( translationUnit );
 }