summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-17 06:18:00 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-17 06:18:00 +0000
commit759143605e3dcf30da036638fe8c4a17b1272c2f (patch)
tree08730a38957a285beb40c1e56d7935765281c271
parent71f9f511ef6e30a0e18c4c8e0040ed7d60b68de9 (diff)
merges r20782 from trunk into ruby_1_9_1.
* parse.y (stmt): returns dispatched result. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@20828 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--parse.y2
2 files changed, 4 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 038f7ece5..85504e364 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.
diff --git a/parse.y b/parse.y
index 01c04744f..bb9e81ce1 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