Changeset 0db6fc0 for src/ControlStruct

Timestamp:

Jun 2, 2017, 6:30:18 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

7985fa5

Parents:

f94ca7e

Message:

convert several passes to PassVisitor?

Location:

src/ControlStruct

Files:

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

src/ControlStruct/ForExprMutator.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// ForExprMutator.cc -- 
+// ForExprMutator.cc --
 //
 // Author           : Rodolfo G. Esteves
@@ -19 +19 @@
 
 namespace ControlStruct {
-        Statement *ForExprMutator::mutate( ForStmt *forStmt ) {
-                // 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 ) );
-
-                std::list<Statement *> &init = forStmt->get_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;
@@ -39 +37 @@
                 forStmt->set_initialization( std::list<Statement *>() );
                 return block;
-
-                return forStmt;
         }
 } // namespace ControlStruct

src/ControlStruct/ForExprMutator.h

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// ForExprMutator.h -- 
+// ForExprMutator.h --
 //
 // Author           : Rodolfo G. Esteves
@@ -21 +21 @@
 
 namespace ControlStruct {
-        class ForExprMutator : public Mutator {
+        class ForExprMutator {
           public:
-                virtual Statement *mutate( ForStmt * );
+                Statement *postmutate( ForStmt * );
         };
 } // namespace ControlStruct

src/ControlStruct/Mutate.cc

@@ -26 +26 @@
 
 #include "Common/utility.h"
+#include "Common/PassVisitor.h"
 
 #include "SynTree/Visitor.h"
@@ -34 +35 @@
         void mutate( std::list< Declaration * > translationUnit ) {
                 // hoist initialization out of for statements
-                ForExprMutator formut;
+                PassVisitor<ForExprMutator> formut;
 
                 // normalizes label definitions and generates multi-level exit labels