From 2ea63eebcc7c30ecb59cd79ef003ac5b7cb467e7 Mon Sep 17 00:00:00 2001 From: yugui Date: Wed, 17 Dec 2008 06:18:00 +0000 Subject: 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 --- ChangeLog | 4 +++- parse.y | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 038f7ece57..85504e364e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,6 @@ -Tue Dec 16 16:29:45 2008 Nobuyoshi Nakada +Tue Dec 16 16:41:51 2008 Nobuyoshi Nakada + + * parse.y (stmt): returns dispatched result. * parse.y (primary): also in ripper, saves in_def before restoring. diff --git a/parse.y b/parse.y index 01c04744f4..bb9e81ce18 100644 --- a/parse.y +++ b/parse.y @@ -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 -- cgit v1.2.3