Changeset b1e63ac5 for src/ControlStruct

Timestamp:

Jul 4, 2017, 9:40:16 AM (9 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, stuck-waitfor-destruct, with_gc

Children:

208e5be

Parents:

9c951e3 (diff), f7cb0bc (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 references

Location:

src/ControlStruct

Files:

• ExceptTranslate.cc (added)
• ExceptTranslate.h (added)
• ForExprMutator.cc (modified) (3 diffs)
• ForExprMutator.h (modified) (2 diffs)
• Mutate.cc (modified) (2 diffs)
• module.mk (modified) (1 diff)

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

src/ControlStruct/module.mk

@@ -10 +10 @@
 ## Author           : Richard C. Bilson
 ## Created On       : Mon Jun  1 17:49:17 2015
-## Last Modified By : Peter A. Buhr
-## Last Modified On : Thu Aug  4 11:38:06 2016
-## Update Count     : 3
+## Last Modified By : Andrew Beach
+## Last Modified On : Wed Jun 28 16:15:00 2017
+## Update Count     : 4
 ###############################################################################
 
 SRC +=  ControlStruct/LabelGenerator.cc \
         ControlStruct/LabelFixer.cc \
-        ControlStruct/MLEMutator.cc \
+        ControlStruct/MLEMutator.cc \
         ControlStruct/Mutate.cc \
-        ControlStruct/ForExprMutator.cc
-
+        ControlStruct/ForExprMutator.cc \
+        ControlStruct/ExceptTranslate.cc