Changeset 6c3744e for translator/ControlStruct

Timestamp:

Jan 19, 2015, 6:29:10 PM (10 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

Location:

translator/ControlStruct

Files:

• LabelFixer.cc (modified) (9 diffs)
• MLEMutator.cc (modified) (6 diffs)
• MLEMutator.h (modified) (2 diffs)

translator/ControlStruct/LabelFixer.cc

@@ -24 +24 @@
     }
 
-    void LabelFixer::visit(FunctionDecl *functionDecl) {
+    void LabelFixer::visit( FunctionDecl *functionDecl ) {
         if ( functionDecl->get_statements() != 0 )
             functionDecl->get_statements()->accept( *this );
@@ -32 +32 @@
     }
 
-    void LabelFixer::visit(Statement *stmt ) {
+    void LabelFixer::visit( Statement *stmt ) {
         std::list< Label > &labels = stmt->get_labels();
 
@@ -42 +42 @@
     }
 
-    void LabelFixer::visit(BranchStmt *branchStmt) {
+    void LabelFixer::visit( BranchStmt *branchStmt ) {
         visit ( ( Statement * )branchStmt );  // the labels this statement might have
 
@@ -50 +50 @@
         } //else       /* computed goto or normal exit-loop statements */
     }
-
 
     Label LabelFixer::setLabelsDef( std::list< Label > &llabel, Statement *definition ) {
@@ -61 +60 @@
                 { used = true; labelTable[ *i ] = entry; } // undefined and unused
             else
-                if( labelTable[ *i ]->defined() )
-                    throw SemanticError("Duplicate definition of label: " + *i );
+                if ( labelTable[ *i ]->defined() )
+                    throw SemanticError( "Duplicate definition of label: " + *i );
                 else
                     labelTable[ *i ]->set_definition( definition );
@@ -82 +81 @@
     }
 
-    std::map < Label, Statement * > *LabelFixer::resolveJumps() throw ( SemanticError ) {
-        std::map < Statement *, Entry * > def_us;
+    std::map<Label, Statement * > *LabelFixer::resolveJumps() throw ( SemanticError ) {
+        std::map< Statement *, Entry * > def_us;
 
-        for ( std::map < Label, Entry *>::iterator i = labelTable.begin(); i != labelTable.end(); i++ ) {
+        for ( std::map< Label, Entry *>::iterator i = labelTable.begin(); i != labelTable.end(); i++ ) {
             Entry *e = i->second;
 
@@ -91 +90 @@
                 def_us[ e->get_definition() ] = e;
             else
-                if(e->used())
+                if ( e->used() )
                     def_us[ e->get_definition() ]->add_uses( e->get_uses() );
         }
 
         // get rid of labelTable
-        for ( std::map < Statement *, Entry * >::iterator i = def_us.begin(); i != def_us.end(); i++ ) {
+        for ( std::map< Statement *, Entry * >::iterator i = def_us.begin(); i != def_us.end(); i++ ) {
             Statement *to = (*i).first;
-            std::list < Statement *> &from = (*i).second->get_uses();
+            std::list< Statement *> &from = (*i).second->get_uses();
             Label finalLabel = generator->newLabel();
             (*i).second->set_label( finalLabel );
@@ -114 +113 @@
 
             for ( std::list< Statement *>::iterator j = from.begin(); j != from.end(); j++ ) {
-                BranchStmt *jumpTo = dynamic_cast < BranchStmt * > ( *j );
+                BranchStmt *jumpTo = dynamic_cast< BranchStmt * > ( *j );
                 assert( jumpTo != 0 );
                 jumpTo->set_target( finalLabel );
@@ -121 +120 @@
 
         // reverse table
-        std::map < Label, Statement * > *ret = new std::map < Label, Statement * >();
-        for (std::map < Statement *, Entry * >::iterator i = def_us.begin(); i != def_us.end(); i++ ) 
+        std::map< Label, Statement * > *ret = new std::map< Label, Statement * >();
+        for ( std::map< Statement *, Entry * >::iterator i = def_us.begin(); i != def_us.end(); i++ ) 
             (*ret)[ (*i).second->get_label() ] = (*i).first;
 

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) );

translator/ControlStruct/MLEMutator.h

@@ -15 +15 @@
         class Entry;
       public:
-        MLEMutator( std::map <Label, Statement *> *t, LabelGenerator *gen = 0 ) : targetTable( t ), breakLabel(std::string("")), generator( gen ) {}
+        MLEMutator( std::map<Label, Statement *> *t, LabelGenerator *gen = 0 ) : targetTable( t ), breakLabel(std::string("")), generator( gen ) {}
         ~MLEMutator();
 
@@ -56 +56 @@
         };
 
-        std::map <Label, Statement *> *targetTable;
-        std::list < Entry > enclosingBlocks,enclosingLoops,enclosingSwitches;
+        std::map< Label, Statement * > *targetTable;
+        std::list< Entry > enclosingBlocks, enclosingLoops, enclosingSwitches;
         Label breakLabel;
         LabelGenerator *generator;