Changes in src/ControlStruct/ForExprMutator.cc [145f1fc:843054c2]

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 : Rob Schluntz
-// Last Modified On : Tue Jul 14 12:14:44 2015
-// Update Count     : 10
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue May 19 15:31:47 2015
+// Update Count     : 2
 //
 
@@ -22 +22 @@
                 // recurse down all nest for loops to hoist any initializer declarations to make them C89 (rather than C99)
                 forStmt->set_body( forStmt->get_body()->acceptMutator( *this ) );
+                if ( DeclStmt *decl = dynamic_cast< DeclStmt * > ( forStmt->get_initialization() ) ) {
+                        // create compound statement, move initializer declaration outside, leave _for_ as-is
+                        CompoundStmt *block = new CompoundStmt( std::list< Label >() );
+                        std::list<Statement *> &stmts = block->get_kids();
 
-                std::list<Statement *> &init = forStmt->get_initialization(); 
-                if ( init.size() == 0 ) {
-                        return forStmt;
+                        stmts.push_back( decl );
+                        forStmt->set_initialization( 0 );
+                        stmts.push_back( forStmt );
+
+                        return block;
                 } // 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 forStmt;