Changeset af68f0a for src/ControlStruct/LabelGenerator.cc

Timestamp:

Apr 5, 2017, 6:07:58 PM (6 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

aaron-thesis, arm-eh, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

c51b5a3

Parents:

fbd7ad6

Message:

change all break/continue statements into goto for consistency and fix bug with labeled break

File:

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

src/ControlStruct/LabelGenerator.cc

@@ -20 +20 @@
 #include "SynTree/Label.h"
 #include "SynTree/Attribute.h"
+#include "SynTree/Statement.h"
 
 namespace ControlStruct {
@@ -31 +32 @@
         }
 
-        Label LabelGenerator::newLabel( std::string suffix ) {
+        Label LabelGenerator::newLabel( std::string suffix, Statement * stmt ) {
                 std::ostringstream os;
                 os << "__L" << current++ << "__" << suffix;
+                if ( stmt && ! stmt->get_labels().empty() ) {
+                        os << "_" << stmt->get_labels().front() << "__";
+                }
                 std::string ret = os.str();
                 Label l( ret );