From 7b7e511246cf366fdcffb59c72556613550484cc Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 5 Dec 2009 09:39:56 +0000
Subject: merges r25404 from trunk into ruby_1_9_1. fixes the backport task
 #2232. -- * parse.y (mlhs_basic): fixed handling splat in middle of mlhs.  a 
  patch from Andy Keep in [ruby-core:26163]

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@26012 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 parse.y | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'parse.y')

diff --git a/parse.y b/parse.y
index b84d6143b..1fa248bf2 100644
--- a/parse.y
+++ b/parse.y
@@ -1475,7 +1475,8 @@ mlhs_basic	: mlhs_head
 		    /*%%%*/
 			$$ = NEW_MASGN($1, NEW_POSTARG($3,$5));
 		    /*%
-			$$ = mlhs_add_star($1, $3);
+			$1 = mlhs_add_star($1, $3);
+			$$ = mlhs_add($1, $5);
 		    %*/
 		    }
 		| mlhs_head tSTAR
-- 
cgit