Changeset 0f8e4ac for src/ControlStruct/LabelFixer.cc

Timestamp:

Jun 16, 2016, 12:24:39 PM (9 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:

25296a3

Parents:

f4bc57c

Message:

change Label from a string typedef to a class

File:

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

src/ControlStruct/LabelFixer.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// LabelFixer.cc -- 
+// LabelFixer.cc --
 //
 // Author           : Rodolfo G. Esteves
@@ -86 +86 @@
 
 
-        // sets the definition of the labelTable entry to be the provided 
+        // sets the definition of the labelTable entry to be the provided
         // statement for every label in the list parameter. Happens for every kind of statement
         Label LabelFixer::setLabelsDef( std::list< Label > &llabel, Statement *definition ) {
@@ -101 +101 @@
                         } else if ( labelTable[ *i ]->defined() ) {
                                 // defined twice, error
-                                throw SemanticError( "Duplicate definition of label: " + *i );
+                                throw SemanticError( "Duplicate definition of label: " + (*i).get_name() );
                         }       else {
                                 // used previously, but undefined until now -> link with this entry
@@ -109 +109 @@
                 } // for
 
-                // produce one of the labels attached to this statement to be 
+                // produce one of the labels attached to this statement to be
                 // temporarily used as the canonical label
                 return labelTable[ llabel.front() ]->get_label();
@@ -130 +130 @@
                 for ( std::map< Label, Entry * >::iterator i = labelTable.begin(); i != labelTable.end(); ++i ) {
                         if ( ! i->second->defined() ) {
-                                throw SemanticError( "Use of undefined label: " + i->first );
+                                throw SemanticError( "Use of undefined label: " + i->first.get_name() );
                         }
                         (*ret)[ i->first ] = i->second->get_definition();