Changeset 28f3a19 for src/ControlStruct

Timestamp:

Jun 27, 2018, 3:28:41 PM (6 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

new-env, with_gc

Children:

b21c77a

Parents:

0182bfa (diff), 63238a4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into with_gc

Location:

src/ControlStruct

Files:

• ForExprMutator.cc (modified) (1 diff)
• ForExprMutator.h (modified) (2 diffs)
• Mutate.cc (modified) (1 diff)
• Mutate.h (modified) (2 diffs)

src/ControlStruct/ForExprMutator.cc

@@ -45 +45 @@
                 return hoist( forStmt, forStmt->initialization );
         }
+        Statement *ForExprMutator::postmutate( WhileStmt *whileStmt ) {
+                return hoist( whileStmt, whileStmt->initialization );
+        }
 } // namespace ControlStruct
 

src/ControlStruct/ForExprMutator.h

@@ -18 +18 @@
 class IfStmt;
 class ForStmt;
+class WhileStmt;
 class Statement;
 
@@ -25 +26 @@
                 Statement *postmutate( IfStmt * );
                 Statement *postmutate( ForStmt * );
+                Statement *postmutate( WhileStmt * );
         };
 } // namespace ControlStruct

src/ControlStruct/Mutate.cc

@@ -27 +27 @@
 #include "SynTree/Visitor.h"       // for acceptAll
 
-using namespace std;
+namespace ControlStruct {
+        void fixLabels( std::list< Declaration * > & translationUnit ) {
+                PassVisitor<LabelFixer> lfix;
+                acceptAll( translationUnit, lfix );
+        }
 
-namespace ControlStruct {
-        void mutate( std::list< Declaration * > translationUnit ) {
-                // hoist initialization out of for statements
+        void hoistControlDecls( std::list< Declaration * > & translationUnit ) {
                 PassVisitor<ForExprMutator> formut;
-
-                // normalizes label definitions and generates multi-level exit labels
-                PassVisitor<LabelFixer> lfix;
-
                 mutateAll( translationUnit, formut );
-                acceptAll( translationUnit, lfix );
         }
 } // namespace CodeGen

src/ControlStruct/Mutate.h

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Mutate.h -- 
+// Mutate.h --
 //
 // Author           : Rodolfo G. Esteves
@@ -20 +20 @@
 class Declaration;
 
+/// Desugars Cforall control structures
 namespace ControlStruct {
-        /// Desugars Cforall control structures
-        void mutate( std::list< Declaration* > translationUnit );
+        /// normalizes label definitions and generates multi-level exit labels
+        void fixLabels( std::list< Declaration * > & translationUnit );
+
+        /// hoist initialization out of for statements
+        void hoistControlDecls( std::list< Declaration * > & translationUnit );
 } // namespace ControlStruct