Changes in src/ControlStruct/MLEMutator.h [94e025a2:d180746]

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
@@ -27 +26 @@
 
 namespace ControlStruct {
-        class LabelGenerator;
+class LabelGenerator;
 
-        class MLEMutator : public WithVisitorRef<MLEMutator>, public WithShortCircuiting {
+        class MLEMutator : public Mutator {
                 class Entry;
 
+                typedef Mutator Parent;
           public:
                 MLEMutator( std::map<Label, Statement *> *t, LabelGenerator *gen = 0 ) : targetTable( t ), breakLabel(std::string("")), generator( gen ) {}
                 ~MLEMutator();
 
-                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 );
+                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;
 
                 Statement *mutateLoop( Statement *bodyLoop, Entry &e );
@@ -58 +54 @@
                                 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; }
@@ -82 +78 @@
 
                 template< typename LoopClass >
-                void prehandleLoopStmt( LoopClass * loopStmt );
+                Statement *handleLoopStmt( LoopClass *loopStmt );
 
-                template< typename LoopClass >
-                Statement * posthandleLoopStmt( LoopClass * loopStmt );
+                template< typename IfClass >
+                Statement *handleIfStmt( IfClass *switchStmt );
+
+                template< typename SwitchClass >
+                Statement *handleSwitchStmt( SwitchClass *switchStmt );
 
                 void fixBlock( std::list< Statement * > &kids );