Changeset 23b6f4d7 for src/ControlStruct/LabelFixer.cc

Timestamp:

Jun 23, 2016, 12:16:45 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

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, with_gc

Children:

71a145de

Parents:

0caaa6a

git-author:

Rob Schluntz <rschlunt@…> (06/23/16 11:34:11)

git-committer:

Rob Schluntz <rschlunt@…> (06/23/16 12:16:45)

Message:

change Label type from std::string to a custom Label class, link label to its statement

File:

• src/ControlStruct/LabelFixer.cc (modified) (2 diffs)

src/ControlStruct/LabelFixer.cc

@@ -95 +95 @@
 
                 for ( std::list< Label >::iterator i = llabel.begin(); i != llabel.end(); i++ ) {
-                        if ( labelTable.find( *i ) == labelTable.end() ) {
+                        Label & l = *i;
+                        l.set_statement( definition ); // attach statement to the label to be used later
+                        if ( labelTable.find( l ) == labelTable.end() ) {
                                 // all labels on this statement need to use the same entry, so this should only be created once
                                 // undefined and unused until now, add an entry
-                                labelTable[ *i ] =  e;
-                        } else if ( labelTable[ *i ]->defined() ) {
+                                labelTable[ l ] =  e;
+                        } else if ( labelTable[ l ]->defined() ) {
                                 // defined twice, error
-                                throw SemanticError( "Duplicate definition of label: " + (*i).get_name() );
+                                throw SemanticError( "Duplicate definition of label: " + l.get_name() );
                         }       else {
                                 // used previously, but undefined until now -> link with this entry
-                                delete labelTable[ *i ];
-                                labelTable[ *i ] = e;
+                                delete labelTable[ l ];
+                                labelTable[ l ] = e;
                         } // if
                 } // for
@@ -114 +116 @@
         }
 
-        // A label was used, add it ot the table if it isn't already there
+        // A label was used, add it to the table if it isn't already there
         template< typename UsageNode >
         void LabelFixer::setLabelsUsg( Label orgValue, UsageNode *use ) {