Changes in src/ControlStruct/MLEMutator.cc [be5aa1b:843054c2]

File:

• src/ControlStruct/MLEMutator.cc (modified) (10 diffs)

src/ControlStruct/MLEMutator.cc

@@ -9 +9 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Wed May 27 16:19:32 2015
-// Update Count     : 44
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue May 19 15:32:26 2015
+// Update Count     : 2
 //
 
@@ -28 +28 @@
         CompoundStmt* MLEMutator::mutate( CompoundStmt *cmpndStmt ) {
                 bool labeledBlock = false;
-                if ( !(cmpndStmt->get_labels().empty()) ) {
+                if ( !((cmpndStmt->get_labels()).empty()) ) {
                         labeledBlock = true;
                         enclosingBlocks.push_back( Entry( cmpndStmt ) );
@@ -42 +42 @@
                                         std::list<Label> ls; ls.push_back( get_breakLabel() );
                                         kids.push_back( new NullStmt( ls ) );
-                                } else {
+                                } else
                                         (*next)->get_labels().push_back( get_breakLabel() );
-                                }
 
                                 set_breakLabel("");
@@ -52 +51 @@
                 if ( labeledBlock ) {
                         assert( ! enclosingBlocks.empty() );
-                        if ( ! enclosingBlocks.back().get_breakExit().empty() ) {
+                        if ( ! enclosingBlocks.back().get_breakExit().empty() )
                                 set_breakLabel( enclosingBlocks.back().get_breakExit() );
-                        }
                         enclosingBlocks.pop_back();
                 } // if
@@ -87 +85 @@
 
         Statement *MLEMutator::mutate( BranchStmt *branchStmt ) throw ( SemanticError ) {
-                std::string originalTarget = branchStmt->get_originalTarget();
-
                 if ( branchStmt->get_type() == BranchStmt::Goto )
                         return branchStmt;
 
                 // test if continue target is a loop
-                if ( branchStmt->get_type() == BranchStmt::Continue) {
-                        if ( enclosingLoops.empty() ) {
-                                throw SemanticError( "'continue' outside a loop" );
-                        } else if ( std::find( enclosingLoops.begin(), enclosingLoops.end(), (*targetTable)[branchStmt->get_target()] ) == enclosingLoops.end() ) {
-                                throw SemanticError( "'continue' target label must be an enclosing loop: " + originalTarget );
-                        }
-                }
+                if ( branchStmt->get_type() == BranchStmt::Continue && enclosingLoops.empty() )
+                        throw SemanticError( "'continue' outside a loop" );
 
                 if ( branchStmt->get_type() == BranchStmt::Break && (enclosingLoops.empty() && enclosingSwitches.empty() && enclosingBlocks.empty() ) )
@@ -107 +98 @@
 
                 if ( targetTable->find( branchStmt->get_target() ) == targetTable->end() )
-                        throw SemanticError("The label defined in the exit loop statement does not exist: " + originalTarget );  // shouldn't happen (since that's already checked)
+                        throw SemanticError("The label defined in the exit loop statement does not exist." );  // shouldn't happen (since that's already checked)
 
                 std::list< Entry >::iterator check;
@@ -115 +106 @@
                                 // neither in loop nor in block, checking if in switch/choose
                                 if ( (check = std::find( enclosingSwitches.begin(), enclosingSwitches.end(), (*targetTable)[branchStmt->get_target()] )) == enclosingSwitches.end() )
-                                        throw SemanticError("The target specified in the exit loop statement does not correspond to an enclosing control structure: " + originalTarget );
+                                        throw SemanticError("The target specified in the exit loop statement does not correspond to an enclosing loop.");
 
                 if ( enclosingLoops.back() == (*check) )
@@ -123 +114 @@
                 switch ( branchStmt->get_type() ) {
                   case BranchStmt::Break:
-                                if ( check->get_breakExit() != "" ) {
-                                        newLabel = check->get_breakExit();
-                                } else {
-                                        newLabel = generator->newLabel();
-                                        check->set_breakExit( newLabel );
-                                } // if
-                                break;
+                        if ( check->get_breakExit() != "" )
+                                newLabel = check->get_breakExit();
+                        else {
+                                newLabel = generator->newLabel();
+                                check->set_breakExit( newLabel );
+                        } // if
+                        break;
                   case BranchStmt::Continue:
-                                if ( check->get_contExit() != "" ) {
-                                        newLabel = check->get_contExit();
-                                } else {
-                                        newLabel = generator->newLabel();
-                                        check->set_contExit( newLabel );
-                                } // if
-                                break;
+                        if ( check->get_contExit() != "" )
+                                newLabel = check->get_contExit();
+                        else {
+                                newLabel = generator->newLabel();
+                                check->set_contExit( newLabel );
+                        } // if
+                        break;
                   default:
-                                return 0;                                       // shouldn't be here
+                        return 0;                                       // shouldn't be here
                 } // switch
 
@@ -145 +136 @@
         }
 
-        template< typename SwitchClass >
-        Statement *handleSwitchStmt( SwitchClass *switchStmt, MLEMutator &mutator ) {
-                // set up some aliases so that the rest of the code isn't messy
-                typedef MLEMutator::Entry Entry;
-                LabelGenerator *generator = mutator.generator;
-                std::list< Entry > &enclosingSwitches = mutator.enclosingSwitches;
-
+
+        Statement *MLEMutator::mutate( SwitchStmt *switchStmt ) {
                 Label brkLabel = generator->newLabel();
                 enclosingSwitches.push_back( Entry(switchStmt, "", brkLabel) );
-                mutateAll( switchStmt->get_branches(), mutator ); {
+                mutateAll( switchStmt->get_branches(), *this ); {
                         // check if this is necessary (if there is a break to this point, otherwise do not generate
                         std::list<Label> temp; temp.push_back( brkLabel );
@@ -164 +150 @@
         }
 
-        Statement *MLEMutator::mutate( SwitchStmt *switchStmt ) {
-                return handleSwitchStmt( switchStmt, *this );
-        }
-
         Statement *MLEMutator::mutate( ChooseStmt *switchStmt ) {
-                return handleSwitchStmt( switchStmt, *this );           
+                Label brkLabel = generator->newLabel();
+                enclosingSwitches.push_back( Entry(switchStmt,"", brkLabel) );
+                mutateAll( switchStmt->get_branches(), *this ); {
+                        // check if this is necessary (if there is a break to this point, otherwise do not generate
+                        std::list<Label> temp; temp.push_back( brkLabel );
+                        switchStmt->get_branches().push_back( new BranchStmt( temp, Label(""), BranchStmt::Break ) );
+                }
+                assert ( enclosingSwitches.back() == switchStmt );
+                enclosingSwitches.pop_back();
+                return switchStmt;
         }