From 6074368b39717341fcdcc349d3b7fecfd9b51e93 Mon Sep 17 00:00:00 2001
From: ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 21 Oct 2008 20:45:35 +0000
Subject: * parse.y (arg_concat_gen): concat target node should be NODE_ARRAY. 
  [ruby-core:19413] * bootstraptest/test_method.rb: add tests.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@19880 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 parse.y | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'parse.y')

diff --git a/parse.y b/parse.y
index da63620f4..54e0c6ab8 100644
--- a/parse.y
+++ b/parse.y
@@ -2443,8 +2443,7 @@ args		: arg_value
 		    {
 		    /*%%%*/
 			NODE *n1;
-			if (nd_type($4) == NODE_ARRAY &&
-			    (n1 = splat_array($1)) != 0) {
+			if ((nd_type($4) == NODE_ARRAY) && (n1 = splat_array($1)) != 0) {
 			    $$ = list_concat(n1, $4);
 			}
 			else {
@@ -8131,7 +8130,8 @@ arg_concat_gen(struct parser_params *parser, NODE *node1, NODE *node2)
 	nd_set_type(node1, NODE_ARGSCAT);
 	return node1;
       case NODE_ARGSCAT:
-	if (nd_type(node2) != NODE_ARRAY) break;
+	if (nd_type(node2) != NODE_ARRAY ||
+	    nd_type(node1->nd_body) != NODE_ARRAY) break;
 	node1->nd_body = list_concat(node1->nd_body, node2);
 	return node1;
     }
-- 
cgit