Changes in src/ControlStruct/ForExprMutator.cc [0db6fc0:8bafacc]

File:

• src/ControlStruct/ForExprMutator.cc (modified) (1 diff)

src/ControlStruct/ForExprMutator.cc

@@ -9 +9 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Tue Jul 14 12:14:44 2015
-// Update Count     : 10
+// Last Modified By : Andrew Beach
+// Last Modified On : Fri Aug 18 10:22:00 2017
+// Update Count     : 12
 //
 
-#include "SynTree/Mutator.h"
-#include "SynTree/Statement.h"
+#include <list>                 // for list, _List_iterator, list<>::iterator
+
 #include "ForExprMutator.h"
+#include "SynTree/Label.h"      // for Label
+#include "SynTree/Statement.h"  // for Statement (ptr only), ForStmt, Compou...
 
 namespace ControlStruct {
+        Statement *hoist( Statement *originalStmt, std::list<Statement *> &init ) {
+                // If no hoisting is needed, skip:
+                if ( 0 == init.size() ) {
+                        return originalStmt;
+                }
+
+                // Create compound statement, move initializers outside,
+                // the resut of the original stays 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 );
+                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)
-                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();
-                for ( std::list<Statement *>::iterator it = init.begin(); it != init.end(); ++it ) {
-                        stmts.push_back( *it );
-                }       // for
-
-                // add for to the new block
-                stmts.push_back( forStmt );
-                forStmt->set_initialization( std::list<Statement *>() );
-                return block;
+                return hoist( forStmt, forStmt->initialization );
         }
 } // namespace ControlStruct