[phc-internals] [phc commit] r1134 - in trunk/src: generated generated_src

[codesite-noreply at google.com]

Author: paul.biggar
Date: Wed Apr  2 12:12:42 2008
New Revision: 1134

Modified:
   trunk/src/generated/AST.cpp
   trunk/src/generated/HIR.cpp
   trunk/src/generated/MIR.cpp
   trunk/src/generated_src/ast.tea
   trunk/src/generated_src/hir.tea
   trunk/src/generated_src/mir.tea

Log:
When we clone mixins, we dont want to discard any attributes already in 
the attr_map, should there be any there.


Modified: trunk/src/generated/AST.cpp
==============================================================================
--- trunk/src/generated/AST.cpp	(original)
+++ trunk/src/generated/AST.cpp	Wed Apr  2 12:12:42 2008
@@ -36,7 +36,7 @@
 void Node::clone_mixin_from(Node* in)
 {
     {
-		attrs = in->attrs->clone();
+		attrs->clone_all_from (in->attrs);
 	}
 }


Modified: trunk/src/generated/HIR.cpp
==============================================================================
--- trunk/src/generated/HIR.cpp	(original)
+++ trunk/src/generated/HIR.cpp	Wed Apr  2 12:12:42 2008
@@ -43,7 +43,7 @@
 void Node::clone_mixin_from(Node* in)
 {
     {
-		attrs = in->attrs->clone();
+		attrs->clone_all_from (in->attrs);
 	}
 }


Modified: trunk/src/generated/MIR.cpp
==============================================================================
--- trunk/src/generated/MIR.cpp	(original)
+++ trunk/src/generated/MIR.cpp	Wed Apr  2 12:12:42 2008
@@ -36,7 +36,7 @@
 void Node::clone_mixin_from(Node* in)
 {
     {
-		attrs = in->attrs->clone();
+		attrs->clone_all_from (in->attrs);
 	}
 }


Modified: trunk/src/generated_src/ast.tea
==============================================================================
--- trunk/src/generated_src/ast.tea	(original)
+++ trunk/src/generated_src/ast.tea	Wed Apr  2 12:12:42 2008
@@ -228,7 +228,7 @@

 	void clone_mixin_from(Node* in)
 	{
-		attrs = in->attrs->clone();
+		attrs->clone_all_from (in->attrs);
 	}

 	void assert_mixin_valid()

Modified: trunk/src/generated_src/hir.tea
==============================================================================
--- trunk/src/generated_src/hir.tea	(original)
+++ trunk/src/generated_src/hir.tea	Wed Apr  2 12:12:42 2008
@@ -239,7 +239,7 @@

 	void clone_mixin_from(Node* in)
 	{
-		attrs = in->attrs->clone();
+		attrs->clone_all_from (in->attrs);
 	}

 	void assert_mixin_valid()

Modified: trunk/src/generated_src/mir.tea
==============================================================================
--- trunk/src/generated_src/mir.tea	(original)
+++ trunk/src/generated_src/mir.tea	Wed Apr  2 12:12:42 2008
@@ -214,7 +214,7 @@

 	void clone_mixin_from(Node* in)
 	{
-		attrs = in->attrs->clone();
+		attrs->clone_all_from (in->attrs);
 	}

 	void assert_mixin_valid()