Changeset 8bafacc for src/ControlStruct

Timestamp:

Aug 18, 2017, 2:23:02 PM (8 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

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

Children:

0dd18fd

Parents:

274ce8c

Message:

New system for formating generated code in CodeGenerator?.

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 : Peter A. Buhr
-// Last Modified On : Thu Aug 17 15:32:46 2017
-// Update Count     : 11
+// Last Modified By : Andrew Beach
+// Last Modified On : Fri Aug 18 10:22:00 2017
+// Update Count     : 12
 //
 
@@ -21 +21 @@
 
 namespace ControlStruct {
-        Statement *ForExprMutator::postmutate( IfStmt *ifStmt ) {
-                std::list<Statement *> &init = ifStmt->get_initialization();
-                if ( init.size() == 0 ) {
-                        return ifStmt;
-                } // if
+        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, leave _for_ as-is
+                // 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( ifStmt );
+                // 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();
-                stmts.splice( stmts.end(), init );
-
-                // add for to the new block
-                stmts.push_back( forStmt );
-                return block;
+                return hoist( forStmt, forStmt->initialization );
         }
 } // namespace ControlStruct