Changes in src/ControlStruct/ForExprMutator.cc [8bafacc:6d49ea3]

File:

• src/ControlStruct/ForExprMutator.cc (modified) (2 diffs)

src/ControlStruct/ForExprMutator.cc

@@ -9 +9 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Fri Aug 18 10:22:00 2017
-// Update Count     : 12
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Thu Aug 17 15:32:46 2017
+// Update Count     : 11
 //
 
@@ -21 +21 @@
 
 namespace ControlStruct {
-        Statement *hoist( Statement *originalStmt, std::list<Statement *> &init ) {
-                // If no hoisting is needed, skip:
-                if ( 0 == init.size() ) {
-                        return originalStmt;
-                }
+        Statement *ForExprMutator::postmutate( IfStmt *ifStmt ) {
+                std::list<Statement *> &init = ifStmt->get_initialization();
+                if ( init.size() == 0 ) {
+                        return ifStmt;
+                } // if
 
-                // Create compound statement, move initializers outside,
-                // the resut of the original stays as is.
+                // create compound statement, move initializers outside, leave _for_ as-is
                 CompoundStmt *block = new CompoundStmt( std::list< Label >() );
                 std::list<Statement *> &stmts = block->get_kids();
                 stmts.splice( stmts.end(), init );
 
-                // Add for to the new block.
-                stmts.push_back( originalStmt );
+                // add for to the new block
+                stmts.push_back( ifStmt );
                 return block;
         }
 
-        Statement *ForExprMutator::postmutate( IfStmt *ifStmt ) {
-                return hoist( ifStmt, ifStmt->initialization );
-        }
         Statement *ForExprMutator::postmutate( ForStmt *forStmt ) {
                 // hoist any initializer declarations to make them C89 (rather than C99)
-                return hoist( forStmt, forStmt->initialization );
+                std::list<Statement *> &init = forStmt->get_initialization();
+                if ( init.size() == 0 ) {
+                        return forStmt;
+                } // if
+
+                // create compound statement, move initializers outside, leave _for_ as-is
+                CompoundStmt *block = new CompoundStmt( std::list< Label >() );
+                std::list<Statement *> &stmts = block->get_kids();
+                stmts.splice( stmts.end(), init );
+
+                // add for to the new block
+                stmts.push_back( forStmt );
+                return block;
         }
 } // namespace ControlStruct