kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* parse.y (call_args): no allow splat after assocs. takes

Browse source 
consistency over compatibility.

* parse.y (call_args2): ditto

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12532 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2007-06-13 13:25:39 +00:00
parent 0e62875433
commit 89c2418467
2 changed files with 7 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -3,6 +3,13 @@ Wed Jun 13 06:05:12 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (darwin): prohibit loading extension libraries to
miniruby.
Tue Jun 12 21:50:51 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
* parse.y (call_args): no allow splat after assocs. takes
consistency over compatibility.
* parse.y (call_args2): ditto
Tue Jun 12 14:53:51 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/mkmf.rb (Logging.quiet, Logging.message): added quiet flag and

60
parse.y
View file

@ -2257,18 +2257,6 @@ call_args : command
$$ = arg_add_optblock($$, $2);
%*/
}
| assocs ',' tSTAR arg_value opt_block_arg
{
/*%%%*/
$$ = NEW_LIST(NEW_HASH($1));
$$ = arg_concat($$, $4);
$$ = arg_blk_pass($$, $5);
/*%
$$ = arg_add_assocs(arg_new(), $1);
$$ = arg_add_star($$, $4);
$$ = arg_add_optblock($$, $5);
%*/
}
| args ',' assocs opt_block_arg
{
/*%%%*/
@ -2278,18 +2266,6 @@ call_args : command
$$ = arg_add_optblock(arg_add_assocs($1, $3), $4);
%*/
}
| args ',' assocs ',' tSTAR arg_value opt_block_arg
{
/*%%%*/
$$ = arg_append($1, NEW_HASH($3));
$$ = arg_concat($$, $6);
$$ = arg_blk_pass($$, $7);
/*%
$$ = arg_add_assocs($1, $3);
$$ = arg_add_star($$, $6);
$$ = arg_add_optblock($$, $7);
%*/
}
| block_arg
/*%c%*/
/*%c
@ -2325,18 +2301,6 @@ call_args2 : arg_value ',' args opt_block_arg
$$ = arg_add_optblock($$, $2);
%*/
}
| assocs ',' tSTAR arg_value opt_block_arg
{
/*%%%*/
$$ = NEW_LIST(NEW_HASH($1));
$$ = arg_concat($$, $4);
$$ = arg_blk_pass($$, $5);
/*%
$$ = arg_add_assocs(arg_new(), $1);
$$ = arg_add_star($$, $4);
$$ = arg_add_optblock($$, $5);
%*/
}
| arg_value ',' assocs opt_block_arg
{
/*%%%*/
@ -2347,18 +2311,6 @@ call_args2 : arg_value ',' args opt_block_arg
$$ = arg_add_optblock($$, $4);
%*/
}
| arg_value ',' assocs ',' tSTAR arg_value opt_block_arg
{
/*%%%*/
$$ = arg_append(NEW_LIST($1), NEW_HASH($3));
$$ = arg_concat($$, $6);
$$ = arg_blk_pass($$, $7);
/*%
$$ = arg_add_assocs(arg_add(arg_new(), $1), $3);
$$ = arg_add_star($$, $6);
$$ = arg_add_optblock($$, $7);
%*/
}
| arg_value ',' args ',' assocs opt_block_arg
{
/*%%%*/
@ -2369,18 +2321,6 @@ call_args2 : arg_value ',' args opt_block_arg
$$ = arg_add_optblock($$, $6);
%*/
}
| arg_value ',' args ',' assocs ',' tSTAR arg_value opt_block_arg
{
/*%%%*/
$$ = arg_append(list_concat(NEW_LIST($1),$3), NEW_HASH($5));
$$ = arg_concat($$, $8);
$$ = arg_blk_pass($$, $9);
/*%
$$ = arg_add_assocs(arg_prepend($3, $1), $5);
$$ = arg_add_star($$, $8);
$$ = arg_add_optblock($$, $9);
%*/
}
| block_arg
;