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

File:

• src/ControlStruct/MLEMutator.cc (modified) (6 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 : Thu Jun 04 15:12:33 2015
-// Update Count     : 173
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue May 19 15:32:26 2015
+// Update Count     : 2
 //
 
@@ -19 +19 @@
 #include "MLEMutator.h"
 #include "SynTree/Statement.h"
-#include "SynTree/Expression.h"
 
 namespace ControlStruct {
@@ -27 +26 @@
         }
 
-        // 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 ) {
+        CompoundStmt* MLEMutator::mutate( CompoundStmt *cmpndStmt ) {
+                bool labeledBlock = false;
+                if ( !((cmpndStmt->get_labels()).empty()) ) {
+                        labeledBlock = true;
+                        enclosingBlocks.push_back( Entry( cmpndStmt ) );
+                } // if
+
+                std::list< Statement * > &kids = cmpndStmt->get_kids();
                 for ( std::list< Statement * >::iterator k = kids.begin(); k != kids.end(); k++ ) {
                         *k = (*k)->acceptMutator(*this);
 
                         if ( ! get_breakLabel().empty() ) {
-                                std::list< Statement * >::iterator next = k+1;
+                                std::list< Statement * >::iterator next = k; next++;
                                 if ( next == kids.end() ) {
                                         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("");
                         } // if
                 } // for
-        }
-
-        CompoundStmt* MLEMutator::mutate( CompoundStmt *cmpndStmt ) {
-                bool labeledBlock = !(cmpndStmt->get_labels().empty());
-                if ( labeledBlock ) {
-                        Label brkLabel = generator->newLabel("blockBreak");
-                        enclosingBlocks.push_back( Entry( cmpndStmt, brkLabel ) );
-                } // if
-
-                // a child statement may set the break label
-                // - if they do, attach it to the next statement
-                std::list< Statement * > &kids = cmpndStmt->get_kids();
-                fixBlock( kids );
 
                 if ( labeledBlock ) {
                         assert( ! enclosingBlocks.empty() );
-                        if ( ! enclosingBlocks.back().useBreakExit().empty() ) {
-                                set_breakLabel( enclosingBlocks.back().useBreakExit() );
-                        }
+                        if ( ! enclosingBlocks.back().get_breakExit().empty() )
+                                set_breakLabel( enclosingBlocks.back().get_breakExit() );
                         enclosingBlocks.pop_back();
                 } // if
 
+                //mutateAll( cmpndStmt->get_kids(), *this );
                 return cmpndStmt;
         }
 
-        template< typename LoopClass >
-        Statement *MLEMutator::handleLoopStmt( LoopClass *loopStmt ) {
-                // remember this as the most recent enclosing loop, then mutate 
-                // the body of the loop -- this will determine whether brkLabel
-                // and contLabel are used with branch statements
-                // and will recursively do the same to nested loops
-                Label brkLabel = generator->newLabel("loopBreak");
-                Label contLabel = generator->newLabel("loopContinue");
-                enclosingLoops.push_back( Entry( loopStmt, brkLabel, contLabel ) );
-                loopStmt->set_body ( loopStmt->get_body()->acceptMutator( *this ) );
-
-                // sanity check that the enclosing loops have been popped correctly
+        Statement *MLEMutator::mutate( WhileStmt *whileStmt ) {
+                enclosingLoops.push_back( Entry( whileStmt ) );
+                whileStmt->set_body ( whileStmt->get_body()->acceptMutator( *this ) );
+
                 Entry &e = enclosingLoops.back();
-                assert ( e == loopStmt );
-
-                // this will take the necessary steps to add definitions of the previous
-                // two labels, if they are used.
-                loopStmt->set_body( mutateLoop( loopStmt->get_body(), e ) );
+                assert ( e == whileStmt );
+                whileStmt->set_body( mutateLoop( whileStmt->get_body(), e ) );
                 enclosingLoops.pop_back();
 
-                return loopStmt;
-        }
-
-        Statement *MLEMutator::mutate( CaseStmt *caseStmt ) {
-                caseStmt->set_condition( maybeMutate( caseStmt->get_condition(), *this ) );
-                fixBlock( caseStmt->get_statements() );
-
-                return caseStmt;
-        }
-
-        template< typename SwitchClass >
-        Statement *MLEMutator::handleSwitchStmt( SwitchClass *switchStmt ) {
-                // generate a label for breaking out of a labeled switch 
-                Label brkLabel = generator->newLabel("switchBreak");
-                enclosingSwitches.push_back( Entry(switchStmt, brkLabel) );
-                mutateAll( switchStmt->get_branches(), *this ); 
-
-                Entry &e = enclosingSwitches.back();
-                assert ( e == switchStmt );
-
-                // only generate break label if labeled break is used
-                if (e.isBreakUsed()) {
-                        // for the purposes of keeping switch statements uniform (i.e. all statements that are 
-                        // direct children of a switch should be CastStmts), append the exit label + break to the 
-                        // last case statement; create a default case if there are no cases
-                        std::list< Statement * > &branches = switchStmt->get_branches();
-                        if ( branches.empty() ) {
-                                branches.push_back( CaseStmt::makeDefault() );
-                        }
-
-                        if ( CaseStmt * c = dynamic_cast< CaseStmt * >( branches.back() ) ) {
-                                std::list<Label> temp; temp.push_back( brkLabel );
-                                c->get_statements().push_back( new BranchStmt( temp, Label(""), BranchStmt::Break ) );
-                        } else assert(0); // as of this point, all branches of a switch are still CaseStmts
-                }
-
-                assert ( enclosingSwitches.back() == switchStmt );
-                enclosingSwitches.pop_back();
-                return switchStmt;
+                return whileStmt;
+        }
+
+        Statement *MLEMutator::mutate( ForStmt *forStmt ) {
+                enclosingLoops.push_back( Entry( forStmt ) );
+                maybeMutate( forStmt->get_body(), *this );
+
+                Entry &e = enclosingLoops.back();
+                assert ( e == forStmt );
+                forStmt->set_body( mutateLoop( forStmt->get_body(), e ) );
+                enclosingLoops.pop_back();
+
+                return forStmt;
         }
 
         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() ) )
@@ -154 +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;
@@ -162 +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 );
-
-                // what about exiting innermost block or switch???
+                                        throw SemanticError("The target specified in the exit loop statement does not correspond to an enclosing loop.");
+
                 if ( enclosingLoops.back() == (*check) )
                         return branchStmt;                              // exit the innermost loop (labels unnecessary)
 
-                // branch error checks, get the appropriate label name and create a goto
-                Label exitLabel;
+                Label newLabel;
                 switch ( branchStmt->get_type() ) {
                   case BranchStmt::Break:
-                                assert( check->useBreakExit() != "");
-                                exitLabel = check->useBreakExit();
-                                break;
+                        if ( check->get_breakExit() != "" )
+                                newLabel = check->get_breakExit();
+                        else {
+                                newLabel = generator->newLabel();
+                                check->set_breakExit( newLabel );
+                        } // if
+                        break;
                   case BranchStmt::Continue:
-                                assert( check->useContExit() != "");
-                                exitLabel = check->useContExit();
-                                break;
+                        if ( check->get_contExit() != "" )
+                                newLabel = check->get_contExit();
+                        else {
+                                newLabel = generator->newLabel();
+                                check->set_contExit( newLabel );
+                        } // if
+                        break;
                   default:
-                                assert(0);                                      // shouldn't be here
+                        return 0;                                       // shouldn't be here
                 } // switch
 
-                return new BranchStmt( std::list<Label>(), exitLabel, BranchStmt::Goto );
+                return new BranchStmt( std::list<Label>(), newLabel, BranchStmt::Goto );
+        }
+
+
+        Statement *MLEMutator::mutate( SwitchStmt *switchStmt ) {
+                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;
+        }
+
+        Statement *MLEMutator::mutate( ChooseStmt *switchStmt ) {
+                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;
         }
 
         Statement *MLEMutator::mutateLoop( Statement *bodyLoop, Entry &e ) {
-                // ensure loop body is a block
                 CompoundStmt *newBody;
                 if ( ! (newBody = dynamic_cast<CompoundStmt *>( bodyLoop )) ) {
@@ -194 +170 @@
                 } // if
 
-                // only generate these when needed
-
-                if ( e.isContUsed() ) {
-                        // continue label goes in the body as the last statement
-                        std::list< Label > labels; labels.push_back( e.useContExit() );
-                        newBody->get_kids().push_back( new NullStmt( labels ) );                        
-                }
-
-                if ( e.isBreakUsed() ) {
-                        // break label goes after the loop -- it'll get set by the 
-                        // outer mutator if we do this
-                        set_breakLabel( e.useBreakExit() );                     
-                }
+                Label endLabel = e.get_contExit();
+
+                if ( e.get_breakExit() != "" ) {
+                        if ( endLabel == "" ) endLabel = generator->newLabel();
+                        // check for whether this label is used or not, so as to not generate extraneous gotos
+                        if (e.breakExitUsed)
+                                newBody->get_kids().push_back( new BranchStmt( std::list< Label >(), endLabel, BranchStmt::Goto ) );
+                        // xxx
+                        //std::list< Label > ls; ls.push_back( e.get_breakExit() );
+                        set_breakLabel( e.get_breakExit() );
+                        //newBody->get_kids().push_back( new BranchStmt( ls, "", BranchStmt::Break ) );
+                } // if
+
+                if ( e.get_breakExit() != "" || e.get_contExit() != "" ) {
+                        if (dynamic_cast< NullStmt *>( newBody->get_kids().back() ))
+                                newBody->get_kids().back()->get_labels().push_back( endLabel );
+                        else {
+                                std::list < Label > ls; ls.push_back( endLabel );
+                                newBody->get_kids().push_back( new NullStmt( ls ) );
+                        } // if
+                } // if
 
                 return newBody;
         }
 
-        Statement *MLEMutator::mutate( WhileStmt *whileStmt ) {
-                return handleLoopStmt( whileStmt );
-        }
-
-        Statement *MLEMutator::mutate( ForStmt *forStmt ) {
-                return handleLoopStmt( forStmt );
-        }
-
-        Statement *MLEMutator::mutate( SwitchStmt *switchStmt ) {
-                return handleSwitchStmt( switchStmt );
-        }
-
-        Statement *MLEMutator::mutate( ChooseStmt *switchStmt ) {
-                return handleSwitchStmt( switchStmt );          
-        }
-
+        //*** Entry's methods
+        void MLEMutator::Entry::set_contExit( Label l ) {
+                assert ( contExit == "" || contExit == l );
+                contExit = l;
+        }
+
+        void MLEMutator::Entry::set_breakExit( Label l ) {
+                assert ( breakExit == "" || breakExit == l );
+                breakExit = l;
+        }
 } // namespace ControlStruct