Changeset 7416d46a for src/ControlStruct/MLEMutator.h

Timestamp:

Jan 30, 2018, 3:54:32 PM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

633a642

Parents:

f792cb8 (diff), 42be3c3 (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• src/ControlStruct/MLEMutator.h (modified) (4 diffs)

src/ControlStruct/MLEMutator.h

@@ -20 +20 @@
 #include <string>                  // for string
 
+#include "Common/PassVisitor.h"
 #include "Common/SemanticError.h"  // for SemanticError
 #include "SynTree/Label.h"         // for Label
@@ -26 +27 @@
 
 namespace ControlStruct {
-class LabelGenerator;
+        class LabelGenerator;
 
-        class MLEMutator : public Mutator {
+        class MLEMutator : public WithVisitorRef<MLEMutator>, public WithShortCircuiting {
                 class Entry;
 
-                typedef Mutator Parent;
           public:
                 MLEMutator( std::map<Label, Statement *> *t, LabelGenerator *gen = 0 ) : targetTable( t ), breakLabel(std::string("")), generator( gen ) {}
                 ~MLEMutator();
 
-                virtual CompoundStmt *mutate( CompoundStmt *cmpndStmt ) override;
-                virtual Statement *mutate( WhileStmt *whileStmt ) override;
-                virtual Statement *mutate( ForStmt *forStmt ) override;
-                virtual Statement *mutate( BranchStmt *branchStmt ) throw ( SemanticError ) override;
-                virtual Statement *mutate( CaseStmt *caseStmt ) override;
-                virtual Statement *mutate( IfStmt *ifStmt ) override;
-                virtual Statement *mutate( SwitchStmt *switchStmt ) override;
+                void premutate( CompoundStmt *cmpndStmt );
+                Statement * postmutate( BranchStmt *branchStmt ) throw ( SemanticError );
+                void premutate( WhileStmt *whileStmt );
+                Statement * postmutate( WhileStmt *whileStmt );
+                void premutate( ForStmt *forStmt );
+                Statement * postmutate( ForStmt *forStmt );
+                void premutate( CaseStmt *caseStmt );
+                void premutate( IfStmt *ifStmt );
+                Statement * postmutate( IfStmt *ifStmt );
+                void premutate( SwitchStmt *switchStmt );
+                Statement * postmutate( SwitchStmt *switchStmt );
 
                 Statement *mutateLoop( Statement *bodyLoop, Entry &e );
@@ -54 +58 @@
                                 loop( _loop ), breakExit( _breakExit ), contExit( _contExit ), breakUsed(false), contUsed(false) {}
 
-                        bool operator==( const Statement *stmt ) { return ( loop == stmt ); }
-                        bool operator!=( const Statement *stmt ) { return ( loop != stmt ); }
+                        bool operator==( const Statement *stmt ) { return loop == stmt; }
+                        bool operator!=( const Statement *stmt ) { return loop != stmt; }
 
-                        bool operator==( const Entry &other ) { return ( loop == other.get_controlStructure() ); }
+                        bool operator==( const Entry &other ) { return loop == other.get_controlStructure(); }
 
                         Statement *get_controlStructure() const { return loop; }
@@ -78 +82 @@
 
                 template< typename LoopClass >
-                Statement *handleLoopStmt( LoopClass *loopStmt );
+                void prehandleLoopStmt( LoopClass * loopStmt );
 
-                template< typename IfClass >
-                Statement *handleIfStmt( IfClass *switchStmt );
-
-                template< typename SwitchClass >
-                Statement *handleSwitchStmt( SwitchClass *switchStmt );
+                template< typename LoopClass >
+                Statement * posthandleLoopStmt( LoopClass * loopStmt );
 
                 void fixBlock( std::list< Statement * > &kids );