summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2001-06-01 07:52:34 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2001-06-01 07:52:34 +0000
commitda548b67f5edc5f876ec5e8a21c491963d2bd670 (patch)
treeb75fbbcd3feb97dacbd25919695cd0e09845713d
parent353650e6b486482a256250611d73b668f3fa8dbc (diff)
* parse.y (call_args2): confusion with list_append() and
list_concat() was fixed. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1486 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--parse.y8
2 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index afb09101eb..73fd7f7a30 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jun 1 16:50:59 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * parse.y (call_args2): confusion with list_append() and
+ list_concat() was fixed.
+
Fri Jun 1 15:01:40 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
* parse.y (yylex): fixed 'print CGI::bar() {}, "\n"' syntax
diff --git a/parse.y b/parse.y
index 9696defde8..e436153945 100644
--- a/parse.y
+++ b/parse.y
@@ -1018,7 +1018,7 @@ call_args : command
call_args2 : arg ',' args opt_block_arg
{
- $$ = arg_blk_pass(list_append(NEW_LIST($1),$3), $4);
+ $$ = arg_blk_pass(list_concat(NEW_LIST($1),$3), $4);
}
| arg ',' tSTAR arg opt_block_arg
{
@@ -1031,7 +1031,7 @@ call_args2 : arg ',' args opt_block_arg
{
value_expr($1);
value_expr($6);
- $$ = arg_concat(list_append($1,$3), $6);
+ $$ = arg_concat(list_concat($1,$3), $6);
$$ = arg_blk_pass($$, $7);
}
| assocs opt_block_arg
@@ -1054,7 +1054,7 @@ call_args2 : arg ',' args opt_block_arg
{
value_expr($1);
value_expr($6);
- $$ = list_append(list_append($1,$3), NEW_HASH($5));
+ $$ = list_append(list_concat($1,$3), NEW_HASH($5));
$$ = arg_blk_pass($$, $6);
}
| arg ',' assocs ',' tSTAR arg opt_block_arg
@@ -1068,7 +1068,7 @@ call_args2 : arg ',' args opt_block_arg
{
value_expr($1);
value_expr($8);
- $$ = arg_concat(list_append(list_append(NEW_LIST($1), $3), NEW_HASH($5)), $8);
+ $$ = arg_concat(list_append(list_concat(NEW_LIST($1), $3), NEW_HASH($5)), $8);
$$ = arg_blk_pass($$, $9);
}
| tSTAR arg opt_block_arg