Changeset 6c3744e for translator/ControlStruct/MLEMutator.cc

Timestamp:

Jan 19, 2015, 6:29:10 PM (9 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

f7f6785

Parents:

0b8cd722

Message:

add list initializer, formatting changes

File:

• translator/ControlStruct/MLEMutator.cc (modified) (6 diffs)

translator/ControlStruct/MLEMutator.cc

@@ -12 +12 @@
     }
 
-    CompoundStmt* MLEMutator::mutate(CompoundStmt *cmpndStmt) {
+    CompoundStmt* MLEMutator::mutate( CompoundStmt *cmpndStmt ) {
         bool labeledBlock = false;
         if ( !((cmpndStmt->get_labels()).empty()) ) {
@@ -27 +27 @@
                 if ( next == kids.end() ) {
                     std::list<Label> ls; ls.push_back( get_breakLabel() );
-                    kids.push_back( new NullStmt(ls) );
+                    kids.push_back( new NullStmt( ls ) );
                 } else
                     (*next)->get_labels().push_back( get_breakLabel() );
@@ -88 +88 @@
         std::list< Entry >::iterator check;
         if ( ( check = std::find( enclosingLoops.begin(), enclosingLoops.end(), (*targetTable)[branchStmt->get_target()] ) ) == enclosingLoops.end() )
-            // not in loop, checking if in switch/choose
+            // not in loop, checking if in block
             if ( (check = std::find( enclosingBlocks.begin(), enclosingBlocks.end(), (*targetTable)[branchStmt->get_target()] )) == enclosingBlocks.end() )
                 // neither in loop nor in block, checking if in switch/choose
@@ -95 +95 @@
 
         if ( enclosingLoops.back() == (*check) )
-            return branchStmt;                      // exit the innermost loop (labels not necessary)
+            return branchStmt;                          // exit the innermost loop (labels unnecessary)
 
         Label newLabel;
@@ -102 +102 @@
             if ( check->get_breakExit() != "" )
                 newLabel = check->get_breakExit();
-            else { newLabel = generator->newLabel(); check->set_breakExit( newLabel ); }
+            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 ); }
+            else {
+                newLabel = generator->newLabel();
+                check->set_contExit( newLabel );
+            } // if
             break;
           default:
-            // shouldn't be here
-            return 0;
+            return 0;                                   // shouldn't be here
         } // switch
 
-        return new BranchStmt(std::list<Label>(), newLabel, BranchStmt::Goto );
+        return new BranchStmt( std::list<Label>(), newLabel, BranchStmt::Goto );
     }
 
 
-    Statement *MLEMutator::mutate(SwitchStmt *switchStmt) {
+    Statement *MLEMutator::mutate( SwitchStmt *switchStmt ) {
         Label brkLabel = generator->newLabel();
         enclosingSwitches.push_back( Entry(switchStmt, "", brkLabel) );
@@ -131 +136 @@
     }
 
-    Statement *MLEMutator::mutate(ChooseStmt *switchStmt) {
+    Statement *MLEMutator::mutate( ChooseStmt *switchStmt ) {
         Label brkLabel = generator->newLabel();
         enclosingSwitches.push_back( Entry(switchStmt,"", brkLabel) );