Changeset 94e0864d for src/ControlStruct

Timestamp:

Jun 24, 2015, 4:12:31 PM (10 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, string, with_gc

Children:

1869adf

Parents:

94b4364 (diff), de62360d (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 resolver

Conflicts:

src/CodeGen/CodeGenerator.cc
src/Parser/ExpressionNode.cc
src/ResolvExpr/Resolver.cc

Location:

src/ControlStruct

Files:

• LabelFixer.cc (modified) (2 diffs)
• LabelGenerator.cc (modified) (2 diffs)

src/ControlStruct/LabelFixer.cc

@@ -9 +9 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Tue Jun 02 15:30:32 2015
-// Update Count     : 93
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jun 23 12:42:23 2015
+// Update Count     : 96
 //
 
@@ -137 +137 @@
                                 Label undef = from.back()->get_target();
                                 throw SemanticError ( "'" + undef + "' label not defined");
-                        }
+                        } // if
 
-                        // generate a new label, and attach it to its defining statement
-                        // as the only label on that statement
-                        Label finalLabel = generator->newLabel();
+                        // generate a new label, and attach it to its defining statement as the only label on that statement
+                        Label finalLabel = generator->newLabel( to->get_labels().back() );
                         entry->set_label( finalLabel );
 

src/ControlStruct/LabelGenerator.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jun  8 14:45:07 2015
-// Update Count     : 12
+// Last Modified On : Tue Jun 23 12:18:34 2015
+// Update Count     : 13
 //
 
@@ -29 +29 @@
         }
 
-        Label LabelGenerator::newLabel(std::string suffix) {
+        Label LabelGenerator::newLabel( std::string suffix ) {
                 std::ostringstream os;
                 os << "__L" << current++ << "__" << suffix;