Changeset 27de955 for src/ControlStruct/MLEMutator.h

Timestamp:

Jun 3, 2015, 3:19:29 PM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, string, with_gc

Children:

4162aea9

Parents:

954463b8

Message:

fix multi-level exit code (labeled break and continue)

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 : Rob Schluntz
-// Last Modified On : Tue May 26 15:04:21 2015
-// Update Count     : 7
+// Last Modified On : Wed Jun 03 15:06:36 2015
+// Update Count     : 25
 //
 
@@ -38 +38 @@
                 Statement *mutate( BranchStmt *branchStmt ) throw ( SemanticError );
 
+                Statement *mutate( CaseStmt *caseStmt ); 
                 Statement *mutate( SwitchStmt *switchStmt );
                 Statement *mutate( ChooseStmt *switchStmt );
@@ -48 +49 @@
                 class Entry {
                   public:
-                        explicit Entry( Statement *_loop = 0, Label _contExit = Label(""), Label _breakExit = Label("") ) :
-                                loop( _loop ), contExit( _contExit ), breakExit( _breakExit ), contExitUsed( false ), breakExitUsed( false ) {}
+                        explicit Entry( Statement *_loop, Label _breakExit, Label _contExit = Label("") ) :
+                                loop( _loop ), breakExit( _breakExit ), contExit( _contExit ), breakUsed(false), contUsed(false) {}
 
                         bool operator==( const Statement *stmt ) { return ( loop == stmt ); }
@@ -58 +59 @@
                         Statement *get_loop() const { return loop; }
 
-                        Label get_contExit() const { return contExit; }
-                        void set_contExit( Label );
+                        Label useContExit() { contUsed = true; return contExit; }
+                        Label useBreakExit() { breakUsed = true; return breakExit; }
 
-                        Label get_breakExit() const { return breakExit; }
-                        void set_breakExit( Label );
+                        bool isContUsed() const { return contUsed; }
+                        bool isBreakUsed() const { return breakUsed; }
 
                   private:
                         Statement *loop;
-                        Label contExit, breakExit;
-                  public: // hack, provide proper [sg]etters
-                        bool contExitUsed, breakExitUsed;
+                        Label breakExit, contExit;
+                        bool breakUsed, contUsed;
                 };
 
@@ -76 +76 @@
                 LabelGenerator *generator;
 
+                template< typename LoopClass >
+                Statement *handleLoopStmt( LoopClass *loopStmt );
+
                 template< typename SwitchClass > 
-                friend Statement *handleSwitchStmt( SwitchClass *switchStmt, MLEMutator &mutator );
+                Statement *handleSwitchStmt( SwitchClass *switchStmt );
+
+                void fixBlock( std::list< Statement * > &kids );
         };
 } // namespace ControlStruct