diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-17 06:18:00 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-17 06:18:00 +0000 |
commit | 2ea63eebcc7c30ecb59cd79ef003ac5b7cb467e7 (patch) | |
tree | 08730a38957a285beb40c1e56d7935765281c271 | |
parent | 677668eacec98fd60481a2c987c9a46dc9dd25ba (diff) |
merges r20782 from trunk into ruby_1_9_1.
* parse.y (stmt): returns dispatched result.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20828 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | parse.y | 2 |
2 files changed, 4 insertions, 2 deletions
@@ -1,4 +1,6 @@ -Tue Dec 16 16:29:45 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> +Tue Dec 16 16:41:51 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * parse.y (stmt): returns dispatched result. * parse.y (primary): also in ripper, saves in_def before restoring. @@ -1142,7 +1142,7 @@ stmt : keyword_alias fitem {lex_state = EXPR_FNAME;} fitem $1->nd_value = $3; $$ = $1; /*% - dispatch2(massign, $1, $3); + $$ = dispatch2(massign, $1, $3); %*/ } | mlhs '=' mrhs |