[phc-internals] [phc commit] r1434 - in branches/saturn: . src/hir_to_mir test/subjects/reduced

[codesite-noreply at google.com]

Author: paul.biggar
Date: Fri Jul  4 08:01:37 2008
New Revision: 1434

Added:
   branches/saturn/test/subjects/reduced/0043.php
      - copied unchanged from r1432, /trunk/test/subjects/reduced/0043.php
   branches/saturn/test/subjects/reduced/0044.php
      - copied unchanged from r1432, /trunk/test/subjects/reduced/0044.php
Modified:
   branches/saturn/   (props changed)
   branches/saturn/src/hir_to_mir/Lower_control_flow.cpp

Log:
Merge from trunk. Log:

Merged revisions 1431-1432 via svnmerge from
https://phc.googlecode.com/svn/trunk

........
   r1431 | paul.biggar | 2008-07-04 15:04:07 +0100 (Fri, 04 Jul 2008) | 
2 lines

  Add reduced test cases for the bugs in Foreach.
........
   r1432 | paul.biggar | 2008-07-04 15:08:01 +0100 (Fri, 04 Jul 2008) | 
2 lines

   Remove attributes after they are used. XML and Saturn unparsers have 
trouble with Nodes as attributes.
........


Modified: branches/saturn/src/hir_to_mir/Lower_control_flow.cpp
==============================================================================
--- branches/saturn/src/hir_to_mir/Lower_control_flow.cpp	(original)
+++ branches/saturn/src/hir_to_mir/Lower_control_flow.cpp	Fri Jul  4 
08:01:37 2008
@@ -31,6 +31,12 @@
 	return NULL;
 }

+void clear_attrs (Node* in)
+{
+	in->attrs->erase ("phc.codegen.break_label");
+	in->attrs->erase ("phc.codegen.continue_label");
+}
+
 template<class T>
 void Lower_control_flow::add_label (Node* in, List<Statement*> *out)
 {
@@ -147,6 +153,7 @@
 	add_label<Break> (in, out);
 	break_levels.pop_back ();
 	continue_levels.pop_back ();
+	clear_attrs (in);
 }

 /* Convert
@@ -295,6 +302,7 @@
 	add_label<Break> (in, out);
 	break_levels.pop_back ();
 	continue_levels.pop_back ();
+	clear_attrs (in);
 }