summaryrefslogtreecommitdiff
path: root/parse.y
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-11-27 02:54:02 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-11-27 02:54:02 +0000
commitdd1e757adb87340ac13354c3228a5c2e1c0b1bb4 (patch)
tree6f0977f9a84bc4d0ac8030c7458ff70a440b5485 /parse.y
parentadc25ed110871abb5ba13fea789ee911dd8ce348 (diff)
merges r24761 and r24999 from trunk into ruby_1_9_1.
-- * compile.c (iseq_compile_each): op_asgn to aref should return rhs. [ruby-core:25387] -- * compile.c (iseq_compile_each), parse.y (stmt, arg): arg_concat() on op_asgn was inversed. [ruby-core:25629] [Bug #2050] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@25940 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'parse.y')
-rw-r--r--parse.y4
1 files changed, 2 insertions, 2 deletions
diff --git a/parse.y b/parse.y
index 9ea945abf9..80a67e1147 100644
--- a/parse.y
+++ b/parse.y
@@ -1100,7 +1100,7 @@ stmt : keyword_alias fitem {lex_state = EXPR_FNAME;} fitem
value_expr($6);
if (!$3) $3 = NEW_ZARRAY();
- args = arg_concat($6, $3);
+ args = arg_concat($3, $6);
if ($5 == tOROP) {
$5 = 0;
}
@@ -1935,7 +1935,7 @@ arg : lhs '=' arg
value_expr($6);
if (!$3) $3 = NEW_ZARRAY();
- args = arg_concat($6, $3);
+ args = arg_concat($3, $6);
if ($5 == tOROP) {
$5 = 0;
}