Changeset 6c3744e for translator/ControlStruct/LabelFixer.cc

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

File:

• translator/ControlStruct/LabelFixer.cc (modified) (9 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;