Changeset 90152a4 for src/ControlStruct/LabelFixer.cc

Timestamp:

Aug 27, 2018, 4:40:34 PM (6 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

b7c89aa

Parents:

f9feab8 (diff), 305581d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into cleanup-dtors

File:

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

src/ControlStruct/LabelFixer.cc

@@ -44 +44 @@
 
         void LabelFixer::postvisit( FunctionDecl * functionDecl ) {
-                MLEMutator mlemut( resolveJumps(), generator );
+                PassVisitor<MLEMutator> mlemut( resolveJumps(), generator );
                 functionDecl->acceptMutator( mlemut );
         }
@@ -92 +92 @@
                         } else if ( labelTable[ l ]->defined() ) {
                                 // defined twice, error
-                                throw SemanticError( "Duplicate definition of label: " + l.get_name() );
+                                SemanticError( l.get_statement()->location, "Duplicate definition of label: " + l.get_name() );
                         }       else {
                                 // used previously, but undefined until now -> link with this entry
@@ -117 +117 @@
 
         // Builds a table that maps a label to its defining statement.
-        std::map<Label, Statement * > *LabelFixer::resolveJumps() throw ( SemanticError ) {
+        std::map<Label, Statement * > *LabelFixer::resolveJumps() throw ( SemanticErrorException ) {
                 std::map< Label, Statement * > *ret = new std::map< Label, Statement * >();
                 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.get_name() );
+                                SemanticError( i->first.get_statement()->location, "Use of undefined label: " + i->first.get_name() );
                         }
                         (*ret)[ i->first ] = i->second->get_definition();