Changes in src/ControlStruct/MLEMutator.h [e39aa0f:d3b7937]

File:

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

src/ControlStruct/MLEMutator.h

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// MLEMutator.h --
+// MLEMutator.h -- 
 //
 // Author           : Rodolfo G. Esteves
@@ -23 +23 @@
 #include "SynTree/SynTree.h"
 #include "SynTree/Mutator.h"
-#include "SynTree/Label.h"
 
 #include "LabelGenerator.h"
@@ -39 +38 @@
                 Statement *mutate( BranchStmt *branchStmt ) throw ( SemanticError );
 
-                Statement *mutate( CaseStmt *caseStmt );
+                Statement *mutate( CaseStmt *caseStmt ); 
                 Statement *mutate( SwitchStmt *switchStmt );
                 Statement *mutate( ChooseStmt *switchStmt );
@@ -56 +55 @@
                         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_loop() ); }
 
-                        Statement *get_controlStructure() const { return loop; }
+                        Statement *get_loop() const { return loop; }
 
                         Label useContExit() { contUsed = true; return contExit; }
@@ -73 +72 @@
 
                 std::map< Label, Statement * > *targetTable;
-                std::list< Entry > enclosingControlStructures;
+                std::list< Entry > enclosingBlocks, enclosingLoops, enclosingSwitches;
                 Label breakLabel;
                 LabelGenerator *generator;
@@ -80 +79 @@
                 Statement *handleLoopStmt( LoopClass *loopStmt );
 
-                template< typename SwitchClass >
+                template< typename SwitchClass > 
                 Statement *handleSwitchStmt( SwitchClass *switchStmt );