From 7aa4ba303aa768fcb58eea17ad375ec9f15e9a2e Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 19 Apr 2006 00:51:49 +0000
Subject: * parse.y (list_concat): should not modify nodes other than  
 NODE_ARRAY.  [ruby-dev:28583]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@10098 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 5 +++++
 parse.y   | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index f29f7e4a3c..e57443eea7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Apr 19 09:49:36 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (list_concat): should not modify nodes other than
+	  NODE_ARRAY.  [ruby-dev:28583]
+
 Tue Apr 18 17:40:37 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/multi-tk.rb: add a binding to a container for a slave IP.
diff --git a/parse.y b/parse.y
index 18f1668e57..d50f06d104 100644
--- a/parse.y
+++ b/parse.y
@@ -4665,6 +4665,8 @@ list_concat(head, tail)
 {
     NODE *last;
 
+    if (nd_type(tail) != NODE_ARRAY)
+        return list_append(head, tail);
     if (head->nd_next) {
 	last = head->nd_next->nd_end;
     }
-- 
cgit v1.2.3