Changes in src/ControlStruct/MLEMutator.h [720a007:d180746]

File:

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

src/ControlStruct/MLEMutator.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Mar  8 16:42:32 2018
-// Update Count     : 41
+// Last Modified On : Sat Jul 22 09:19:59 2017
+// Update Count     : 35
 //
 
@@ -19 +19 @@
 #include <map>                     // for map
 #include <string>                  // for string
-#include <set>                     // for unordered_set
 
-#include "Common/PassVisitor.h"
 #include "Common/SemanticError.h"  // for SemanticError
 #include "SynTree/Label.h"         // for Label
@@ -28 +26 @@
 
 namespace ControlStruct {
-        class LabelGenerator;
+class LabelGenerator;
 
-        class MLEMutator : public WithVisitorRef<MLEMutator>, public WithShortCircuiting, public WithGuards {
+        class MLEMutator : public Mutator {
+                class Entry;
+
+                typedef Mutator Parent;
           public:
-                class Entry;
                 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 ( SemanticErrorException );
-                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 );
@@ -52 +48 @@
                 Label &get_breakLabel() { return breakLabel; }
                 void set_breakLabel( Label newValue ) { breakLabel = newValue; }
-
+          private:
                 class Entry {
                   public:
-                        // specialized constructors for each combination of statement with labelled break/continue/fallthrough that is valid to cleanup the use cases
-                        explicit Entry( ForStmt *stmt, Label breakExit, Label contExit ) :
-                                stmt( stmt ), breakExit( breakExit ), contExit( contExit ) {}
+                        explicit Entry( Statement *_loop, Label _breakExit, Label _contExit = Label("") ) :
+                                loop( _loop ), breakExit( _breakExit ), contExit( _contExit ), breakUsed(false), contUsed(false) {}
 
-                        explicit Entry( WhileStmt *stmt, Label breakExit, Label contExit ) :
-                                stmt( stmt ), breakExit( breakExit ), contExit( contExit ) {}
+                        bool operator==( const Statement *stmt ) { return ( loop == stmt ); }
+                        bool operator!=( const Statement *stmt ) { return ( loop != stmt ); }
 
-                        explicit Entry( CompoundStmt *stmt, Label breakExit ) :
-                                stmt( stmt ), breakExit( breakExit ) {}
+                        bool operator==( const Entry &other ) { return ( loop == other.get_controlStructure() ); }
 
-                        explicit Entry( IfStmt *stmt, Label breakExit ) :
-                                stmt( stmt ), breakExit( breakExit ) {}
-
-                        explicit Entry( CaseStmt *stmt, Label fallExit ) :
-                                stmt( stmt ), fallExit( fallExit ) {}
-
-                        explicit Entry( SwitchStmt *stmt, Label breakExit, Label fallDefaultExit ) :
-                                stmt( stmt ), breakExit( breakExit ), fallDefaultExit( fallDefaultExit ) {}
-
-                        bool operator==( const Statement *other ) { return stmt == other; }
-                        bool operator!=( const Statement *other ) { return stmt != other; }
-
-                        bool operator==( const Entry &other ) { return stmt == other.get_controlStructure(); }
-
-                        Statement *get_controlStructure() const { return stmt; }
+                        Statement *get_controlStructure() const { return loop; }
 
                         Label useContExit() { contUsed = true; return contExit; }
                         Label useBreakExit() { breakUsed = true; return breakExit; }
-                        Label useFallExit() { fallUsed = true; return fallExit; }
-                        Label useFallDefaultExit() { fallDefaultUsed = true; return fallDefaultExit; }
 
                         bool isContUsed() const { return contUsed; }
                         bool isBreakUsed() const { return breakUsed; }
-                        bool isFallUsed() const { return fallUsed; }
-                        bool isFallDefaultUsed() const { return fallDefaultUsed; }
-                        void seenDefault() { fallDefaultValid = false; }
-                        bool isFallDefaultValid() const { return fallDefaultValid; }
                   private:
-                        Statement *stmt;
-                        Label breakExit, contExit, fallExit, fallDefaultExit;
-                        bool breakUsed = false, contUsed = false, fallUsed = false, fallDefaultUsed = false;
-                        bool fallDefaultValid = true;
+                        Statement *loop;
+                        Label breakExit, contExit;
+                        bool breakUsed, contUsed;
                 };
 
-          private:
                 std::map< Label, Statement * > *targetTable;
-                std::set< Label > fallthroughLabels;
                 std::list< Entry > enclosingControlStructures;
                 Label breakLabel;
@@ -107 +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 );
 
-                void fixBlock( std::list< Statement * > &kids, bool caseClause = false );
+                template< typename SwitchClass >
+                Statement *handleSwitchStmt( SwitchClass *switchStmt );
+
+                void fixBlock( std::list< Statement * > &kids );
         };
 } // namespace ControlStruct