diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-12-05 09:39:56 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-12-05 09:39:56 +0000 |
commit | fbfcacb0c29a9910ee24aff2484fd080e29abf81 (patch) | |
tree | 03b9b5feb0f97e2f281695cb3906b5673e05e480 /parse.y | |
parent | 69b51262f3ec90a2ac9553d7cd34ee285ec59ad5 (diff) |
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: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@26012 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'parse.y')
-rw-r--r-- | parse.y | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -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 |