Changeset 6d49ea3 for src/ControlStruct

Timestamp:

Aug 17, 2017, 5:37:20 PM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

274ce8c

Parents:

936e9f4

Message:

second attempt, add declarations into if conditional

Location:

src/ControlStruct

Files:

• ForExprMutator.cc (modified) (3 diffs)
• ForExprMutator.h (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 : Thu Aug 17 15:32:46 2017
+// Update Count     : 11
 //
 
@@ -21 +21 @@
 
 namespace ControlStruct {
+        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, 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( ifStmt );
+                return block;
+        }
+
         Statement *ForExprMutator::postmutate( ForStmt *forStmt ) {
                 // hoist any initializer declarations to make them C89 (rather than C99)
@@ -31 +47 @@
                 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
+                stmts.splice( stmts.end(), init );
 
                 // add for to the new block
                 stmts.push_back( forStmt );
-                forStmt->set_initialization( std::list<Statement *>() );
                 return block;
         }

src/ControlStruct/ForExprMutator.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Jul 22 09:17:08 2017
-// Update Count     : 4
+// Last Modified On : Thu Aug 17 15:32:48 2017
+// Update Count     : 5
 //
 
 #pragma once
 
+class IfStmt;
 class ForStmt;
 class Statement;
@@ -22 +23 @@
         class ForExprMutator {
           public:
+                Statement *postmutate( IfStmt * );
                 Statement *postmutate( ForStmt * );
         };