Changes in src/ControlStruct/MLEMutator.cc [720a007:a16764a6]

File:

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

src/ControlStruct/MLEMutator.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Mar  8 17:08:25 2018
-// Update Count     : 219
+// Last Modified On : Thu Aug  4 11:21:32 2016
+// Update Count     : 202
 //
 
@@ -38 +38 @@
         }
         namespace {
-                bool isLoop( const MLEMutator::Entry & e ) { return dynamic_cast< WhileStmt * >( e.get_controlStructure() ) || dynamic_cast< ForStmt * >( e.get_controlStructure() ); }
-                bool isSwitch( const MLEMutator::Entry & e ) { return dynamic_cast< SwitchStmt *>( e.get_controlStructure() ); }
-
-                bool isBreakTarget( const MLEMutator::Entry & e ) { return isLoop( e ) || isSwitch( e ) || dynamic_cast< CompoundStmt *>( e.get_controlStructure() ); }
-                bool isContinueTarget( const MLEMutator::Entry & e ) { return isLoop( e ); }
-                bool isFallthroughTarget( const MLEMutator::Entry & e ) { return dynamic_cast< CaseStmt *>( e.get_controlStructure() );; }
-                bool isFallthroughDefaultTarget( const MLEMutator::Entry & e ) { return isSwitch( e ); }
-        } // namespace
+                Statement * isLoop( Statement * stmt ) { return dynamic_cast< WhileStmt * >( stmt ) ? stmt : dynamic_cast< ForStmt * >( stmt ) ? stmt : 0; }
+        }
 
         // break labels have to come after the statement they break out of, so mutate a statement, then if they inform us
         // through the breakLabel field tha they need a place to jump to on a break statement, add the break label to the
         // body of statements
-        void MLEMutator::fixBlock( std::list< Statement * > &kids, bool caseClause ) {
-                SemanticErrorException errors;
-
+        void MLEMutator::fixBlock( std::list< Statement * > &kids ) {
                 for ( std::list< Statement * >::iterator k = kids.begin(); k != kids.end(); k++ ) {
-                        if ( caseClause ) {
-                                // once a label is seen, it's no longer a valid fallthrough target
-                                for ( Label & l : (*k)->labels ) {
-                                        fallthroughLabels.erase( l );
-                                }
-                        }
-
-                        // aggregate errors since the PassVisitor mutate loop was unrollled
-                        try {
-                                *k = (*k)->acceptMutator(*visitor);
-                        } catch( SemanticErrorException &e ) {
-                                errors.append( e );
-                        }
+                        *k = (*k)->acceptMutator(*visitor);
 
                         if ( ! get_breakLabel().empty() ) {
@@ -75 +55 @@
                         } // if
                 } // for
-
-                if ( ! errors.isEmpty() ) {
-                        throw errors;
-                }
         }
 
@@ -87 +63 @@
                         Label brkLabel = generator->newLabel("blockBreak", cmpndStmt);
                         enclosingControlStructures.push_back( Entry( cmpndStmt, brkLabel ) );
-                        GuardAction( [this]() { enclosingControlStructures.pop_back(); } );
                 } // if
 
@@ -99 +74 @@
                                 set_breakLabel( enclosingControlStructures.back().useBreakExit() );
                         } // if
+                        enclosingControlStructures.pop_back();
                 } // if
         }
@@ -136 +112 @@
                                         if ( isContinue ) {
                                                 // continue target is outermost loop
-                                                targetEntry = std::find_if( enclosingControlStructures.rbegin(), enclosingControlStructures.rend(), isContinueTarget );
+                                                targetEntry = std::find_if( enclosingControlStructures.rbegin(), enclosingControlStructures.rend(), [](Entry &e) { return isLoop( e.get_controlStructure() ); } );
                                         } else {
-                                                // break target is outermost loop, switch, or block control structure
-                                                if ( enclosingControlStructures.empty() ) SemanticError( branchStmt->location, "'break' outside a loop, 'switch', or labelled block" );
-                                                targetEntry = std::find_if( enclosingControlStructures.rbegin(), enclosingControlStructures.rend(), isBreakTarget );
+                                                // break target is outmost control structure
+                                                if ( enclosingControlStructures.empty() ) SemanticError( branchStmt->location, "'break' outside a loop, switch, or labelled block" );
+                                                targetEntry = enclosingControlStructures.rbegin();
                                         } // if
                                 } else {
@@ -147 +123 @@
                                 } // if
                                 // ensure that selected target is valid
-                                if ( targetEntry == enclosingControlStructures.rend() || (isContinue && ! isContinueTarget( *targetEntry ) ) ) {
+                                if ( targetEntry == enclosingControlStructures.rend() || (isContinue && ! isLoop( targetEntry->get_controlStructure() ) ) ) {
                                         SemanticError( branchStmt->location, toString( (isContinue ? "'continue'" : "'break'"), " target must be an enclosing ", (isContinue ? "loop: " : "control structure: "), originalTarget ) );
                                 } // if
                                 break;
                         }
-                        case BranchStmt::FallThrough:
-                                targetEntry = std::find_if( enclosingControlStructures.rbegin(), enclosingControlStructures.rend(), isFallthroughTarget );
-                                // ensure that selected target is valid
-                                if ( targetEntry == enclosingControlStructures.rend() ) {
-                                        SemanticError( branchStmt->location, "'fallthrough' must be enclosed in a 'switch' or 'choose'" );
-                                } // if
-                                if ( branchStmt->get_target() != "" ) {
-                                        // labelled fallthrough
-                                        // target must be in the set of valid fallthrough labels
-                                        if ( ! fallthroughLabels.count( branchStmt->get_target() ) ) {
-                                                SemanticError( branchStmt->location, toString( "'fallthrough' target must be a later case statement: ", originalTarget ) );
-                                        }
-                                        return new BranchStmt( originalTarget, BranchStmt::Goto );
-                                }
-                                break;
-                        case BranchStmt::FallThroughDefault: {
-                                // fallthrough default
-                                targetEntry = std::find_if( enclosingControlStructures.rbegin(), enclosingControlStructures.rend(), isFallthroughDefaultTarget );
-
-                                // ensure that fallthrough is within a switch or choose
-                                if ( targetEntry == enclosingControlStructures.rend() ) {
-                                        SemanticError( branchStmt->location, "'fallthrough' must be enclosed in a 'switch' or 'choose'" );
-                                } // if
-
-                                // ensure that switch or choose has a default clause
-                                SwitchStmt * switchStmt = strict_dynamic_cast< SwitchStmt * >( targetEntry->get_controlStructure() );
-                                bool foundDefault = false;
-                                for ( Statement * stmt : switchStmt->statements ) {
-                                        CaseStmt * caseStmt = strict_dynamic_cast< CaseStmt * >( stmt );
-                                        if ( caseStmt->isDefault() ) {
-                                                foundDefault = true;
-                                        } // if
-                                } // for
-                                if ( ! foundDefault ) {
-                                        SemanticError( branchStmt->location, "'fallthrough default' must be enclosed in a 'switch' or 'choose' control structure with a 'default' clause" );
-                                }
-                                break;
-                        }
-
                         default:
                                 assert( false );
@@ -206 +143 @@
                                 exitLabel = targetEntry->useContExit();
                                 break;
-                  case BranchStmt::FallThrough:
-                                assert( targetEntry->useFallExit() != "");
-                                exitLabel = targetEntry->useFallExit();
-                                break;
-                  case BranchStmt::FallThroughDefault:
-                                assert( targetEntry->useFallDefaultExit() != "");
-                                exitLabel = targetEntry->useFallDefaultExit();
-                                // check that fallthrough default comes before the default clause
-                                if ( ! targetEntry->isFallDefaultValid() ) {
-                                        SemanticError( branchStmt->location, "'fallthrough default' must precede the 'default' clause" );
-                                }
-                                break;
                   default:
                                 assert(0);                                      // shouldn't be here
@@ -262 +187 @@
                 Label contLabel = generator->newLabel("loopContinue", loopStmt);
                 enclosingControlStructures.push_back( Entry( loopStmt, brkLabel, contLabel ) );
-                GuardAction( [this]() { enclosingControlStructures.pop_back(); } );
         }
 
@@ -273 +197 @@
 
                 // this will take the necessary steps to add definitions of the previous two labels, if they are used.
-                loopStmt->body = mutateLoop( loopStmt->get_body(), e );
+                loopStmt->set_body( mutateLoop( loopStmt->get_body(), e ) );
+                enclosingControlStructures.pop_back();
                 return loopStmt;
         }
@@ -299 +224 @@
                         Label brkLabel = generator->newLabel("blockBreak", ifStmt);
                         enclosingControlStructures.push_back( Entry( ifStmt, brkLabel ) );
-                        GuardAction( [this]() { enclosingControlStructures.pop_back(); } );
                 } // if
         }
@@ -309 +233 @@
                                 set_breakLabel( enclosingControlStructures.back().useBreakExit() );
                         } // if
+                        enclosingControlStructures.pop_back();
                 } // if
                 return ifStmt;
@@ -315 +240 @@
         void MLEMutator::premutate( CaseStmt *caseStmt ) {
                 visit_children = false;
-
-                // mark default as seen before visiting its statements to catch default loops
-                if ( caseStmt->isDefault() ) {
-                        enclosingControlStructures.back().seenDefault();
-                } // if
-
                 caseStmt->condition = maybeMutate( caseStmt->condition, *visitor );
-                Label fallLabel = generator->newLabel( "fallThrough", caseStmt );
-                {
-                        // ensure that stack isn't corrupted by exceptions in fixBlock
-                        auto guard = makeFuncGuard( [&]() { enclosingControlStructures.push_back( Entry( caseStmt, fallLabel ) ); }, [this]() { enclosingControlStructures.pop_back(); } );
-
-                        // empty case statement
-                        if( ! caseStmt->stmts.empty() ) {
-                                // the parser ensures that all statements in a case are grouped into a block
-                                CompoundStmt * block = strict_dynamic_cast< CompoundStmt * >( caseStmt->stmts.front() );
-                                fixBlock( block->kids, true );
-
-                                // add fallthrough label if necessary
-                                assert( ! enclosingControlStructures.empty() );
-                                if ( enclosingControlStructures.back().isFallUsed() ) {
-                                        std::list<Label> ls{ enclosingControlStructures.back().useFallExit() };
-                                        caseStmt->stmts.push_back( new NullStmt( ls ) );
-                                } // if
-                        } // if
-                }
-                assert( ! enclosingControlStructures.empty() );
-                assertf( dynamic_cast<SwitchStmt *>( enclosingControlStructures.back().get_controlStructure() ), "Control structure enclosing a case clause must be a switch, but is: %s", toCString( enclosingControlStructures.back().get_controlStructure() ) );
-                if ( caseStmt->isDefault() ) {
-                        if ( enclosingControlStructures.back().isFallDefaultUsed() ) {
-                                // add fallthrough default label if necessary
-                                std::list<Label> ls{ enclosingControlStructures.back().useFallDefaultExit() };
-                                caseStmt->stmts.push_front( new NullStmt( ls ) );
-                        } // if
-                } // if
+                fixBlock( caseStmt->stmts );
         }
 
@@ -355 +247 @@
                 // generate a label for breaking out of a labeled switch
                 Label brkLabel = generator->newLabel("switchBreak", switchStmt);
-                auto it = std::find_if( switchStmt->statements.rbegin(), switchStmt->statements.rend(), [](Statement * stmt) {
-                        CaseStmt * caseStmt = strict_dynamic_cast< CaseStmt * >( stmt );
-                        return caseStmt->isDefault();
-                });
-                CaseStmt * defaultCase = it != switchStmt->statements.rend() ? strict_dynamic_cast<CaseStmt *>( *it ) : nullptr;
-                Label fallDefaultLabel = defaultCase ? generator->newLabel( "fallThroughDefault", defaultCase ) : "";
-                enclosingControlStructures.push_back( Entry(switchStmt, brkLabel, fallDefaultLabel) );
-                GuardAction( [this]() { enclosingControlStructures.pop_back(); } );
-
-                // Collect valid labels for fallthrough. This is initially all labels at the same level as a case statement.
-                // As labels are seen during traversal, they are removed, since fallthrough is not allowed to jump backwards.
-                for ( Statement * stmt : switchStmt->statements ) {
-                        CaseStmt * caseStmt = strict_dynamic_cast< CaseStmt * >( stmt );
-                        if ( caseStmt->stmts.empty() ) continue;
-                        CompoundStmt * block = dynamic_cast< CompoundStmt * >( caseStmt->stmts.front() );
-                        for ( Statement * stmt : block->kids ) {
-                                for ( Label & l : stmt->labels ) {
-                                        fallthroughLabels.insert( l );
-                                }
-                        }
-                }
+                enclosingControlStructures.push_back( Entry(switchStmt, brkLabel) );
         }
 
@@ -400 +272 @@
 
                 assert ( enclosingControlStructures.back() == switchStmt );
+                enclosingControlStructures.pop_back();
                 return switchStmt;
         }