Changeset 413f7f8 for src/ControlStruct

Timestamp:

Jul 7, 2015, 1:49:58 PM (10 years ago)

Author:

Aaron Moss <a3moss@…>

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:

82dd287

Parents:

e0ff3e6 (diff), 8686f31 (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

src/ControlStruct

Files:

• LabelFixer.h (modified) (2 diffs)
• MLEMutator.cc (modified) (2 diffs)

src/ControlStruct/LabelFixer.h

@@ -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 23 15:47:25 2015
-// Update Count     : 28
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Mon Jun 29 17:24:39 2015
+// Update Count     : 29
 //
 
@@ -94 +94 @@
                         }
 
-                        void add_uses ( Entry &other ) { usage.insert( usage.end(), other.usage.begin(), usage.end() ); }
+                        void add_uses ( Entry &other ) { usage.insert( usage.end(), other.usage.begin(), other.usage.end() ); }
                   private:
                         Label label;  

src/ControlStruct/MLEMutator.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Thu Jun 04 15:12:33 2015
-// Update Count     : 173
+// Last Modified On : Sat Jun 27 10:56:14 2015
+// Update Count     : 174
 //
 
@@ -143 +143 @@
                         if ( enclosingLoops.empty() ) {
                                 throw SemanticError( "'continue' outside a loop" );
-                        } else if ( std::find( enclosingLoops.begin(), enclosingLoops.end(), (*targetTable)[branchStmt->get_target()] ) == enclosingLoops.end() ) {
+                        } else if ( branchStmt->get_target() != "" && std::find( enclosingLoops.begin(), enclosingLoops.end(), (*targetTable)[branchStmt->get_target()] ) == enclosingLoops.end() ) {
                                 throw SemanticError( "'continue' target label must be an enclosing loop: " + originalTarget );
                         }