Changeset 145f1fc for src/ControlStruct

Timestamp:

Jul 15, 2015, 2:59:57 PM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, string, with_gc

Children:

1ab4ce2, 2794fff, e45215c

Parents:

85c4ef0

Message:

modified ForStmt? to have a list of statements for the initialization portion, and reverted to hoisting the initialization

Location:

src/ControlStruct

Files:

• ForExprMutator.cc (modified) (2 diffs)
• Mutate.cc (modified) (3 diffs)

src/ControlStruct/ForExprMutator.cc

@@ -9 +9 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Tue May 19 15:31:47 2015
-// Update Count     : 2
+// Last Modified By : Rob Schluntz
+// Last Modified On : Tue Jul 14 12:14:44 2015
+// Update Count     : 10
 //
 
@@ -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();
 
-                        stmts.push_back( decl );
-                        forStmt->set_initialization( 0 );
-                        stmts.push_back( forStmt );
+                std::list<Statement *> &init = forStmt->get_initialization(); 
+                if ( init.size() == 0 ) {
+                        return forStmt;
+                } // if
 
-                        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;

src/ControlStruct/Mutate.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Wed Jun 03 23:08:43 2015
-// Update Count     : 5
+// Last Modified On : Wed Jul 15 14:50:04 2015
+// Update Count     : 7
 //
 
@@ -36 +36 @@
 namespace ControlStruct {
         void mutate( std::list< Declaration * > translationUnit ) {
-                // ForExprMutator formut;
+                // hoist initialization out of for statements
+                ForExprMutator formut;
 
                 // normalizes label definitions and generates multi-level
@@ -51 +52 @@
                 // LabelTypeChecker lbl;
 
-                // mutateAll( translationUnit, formut );
+                mutateAll( translationUnit, formut );
                 acceptAll( translationUnit, lfix );
                 mutateAll( translationUnit, chmut );