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

File:

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

src/ControlStruct/MLEMutator.cc

@@ -10 +10 @@
 // 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 On : Tue Jun 02 13:43:01 2015
+// Update Count     : 92
 //
 
@@ -33 +33 @@
                 } // 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();
                 for ( std::list< Statement * >::iterator k = kids.begin(); k != kids.end(); k++ ) {
@@ -38 +40 @@
 
                         if ( ! get_breakLabel().empty() ) {
-                                std::list< Statement * >::iterator next = k; next++;
+                                std::list< Statement * >::iterator next = k+1;
                                 if ( next == kids.end() ) {
                                         std::list<Label> ls; ls.push_back( get_breakLabel() );
@@ -58 +60 @@
                 } // if
 
-                //mutateAll( cmpndStmt->get_kids(), *this );
                 return cmpndStmt;
         }
@@ -76 +77 @@
         Statement *MLEMutator::mutate( ForStmt *forStmt ) {
                 enclosingLoops.push_back( Entry( forStmt ) );
-                maybeMutate( forStmt->get_body(), *this );
+                forStmt->set_body( maybeMutate( forStmt->get_body(), *this ) );
 
                 Entry &e = enclosingLoops.back();
@@ -154 +155 @@
                 Label brkLabel = generator->newLabel();
                 enclosingSwitches.push_back( Entry(switchStmt, "", brkLabel) );
-                mutateAll( switchStmt->get_branches(), mutator ); {
+                mutateAll( switchStmt->get_branches(), mutator ); 
+                {
                         // 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 ) );
+
+                        // 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);
                 }
                 assert ( enclosingSwitches.back() == switchStmt );
@@ -173 +186 @@
 
         Statement *MLEMutator::mutateLoop( Statement *bodyLoop, Entry &e ) {
+                // ensure loop body is a block
                 CompoundStmt *newBody;
                 if ( ! (newBody = dynamic_cast<CompoundStmt *>( bodyLoop )) ) {
@@ -204 +218 @@
         }
 
-        //*** Entry's methods
+        //*** Entry's methods - ensure these labels can be set at most once
         void MLEMutator::Entry::set_contExit( Label l ) {
                 assert ( contExit == "" || contExit == l );