1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* parse.y (call_args): allow splat argument after unpacked

Browse Source 
assocs like 1.8 does.

* parse.y (call_args): ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12477 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2007-06-08 05:58:06 +00:00
parent b1cd416c1a
commit 4d43632852
3 changed files with 75 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Fri Jun 8 14:53:28 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
* parse.y (call_args): allow splat argument after unpacked
assocs like 1.8 does.
* parse.y (call_args): ditto.
Fri Jun 8 14:26:18 2007 Tanaka Akira <akr@fsij.org> Fri Jun 8 14:26:18 2007 Tanaka Akira <akr@fsij.org>
* lib/secrand.rb: new file for secure random interface. * lib/secrand.rb: new file for secure random interface.

66
parse.y
View File

@ -2257,6 +2257,18 @@ call_args : command
$$ = arg_add_optblock($$, $2); $$ = 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 | args ',' assocs opt_block_arg
{ {
/*%%%*/ /*%%%*/
@ -2266,6 +2278,18 @@ call_args : command
$$ = arg_add_optblock(arg_add_assocs($1, $3), $4); $$ = 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 | block_arg
/*%c%*/ /*%c%*/
/*%c /*%c
@ -2297,7 +2321,20 @@ call_args2 : arg_value ',' args opt_block_arg
$$ = NEW_LIST(NEW_HASH($1)); $$ = NEW_LIST(NEW_HASH($1));
$$ = arg_blk_pass($$, $2); $$ = arg_blk_pass($$, $2);
/*% /*%
$$ = arg_add_optblock(arg_add_assocs(arg_new(), $1), $2); $$ = arg_add_assocs(arg_new(), $1);
$$ = 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 | arg_value ',' assocs opt_block_arg
@ -2310,6 +2347,18 @@ call_args2 : arg_value ',' args opt_block_arg
$$ = arg_add_optblock($$, $4); $$ = 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 | arg_value ',' args ',' assocs opt_block_arg
{ {
/*%%%*/ /*%%%*/
@ -2320,6 +2369,18 @@ call_args2 : arg_value ',' args opt_block_arg
$$ = arg_add_optblock($$, $6); $$ = 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 | block_arg
; ;
@ -2371,6 +2432,9 @@ opt_block_arg : ',' block_arg
$$ = $2; $$ = $2;
} }
| none | none
{
$$ = 0;
}
; ;
args : arg_value args : arg_value

6
version.h
View File

@ -1,7 +1,7 @@
#define RUBY_VERSION "1.9.0" #define RUBY_VERSION "1.9.0"
#define RUBY_RELEASE_DATE "2007-06-07" #define RUBY_RELEASE_DATE "2007-06-08"
#define RUBY_VERSION_CODE 190 #define RUBY_VERSION_CODE 190
#define RUBY_RELEASE_CODE 20070607 #define RUBY_RELEASE_CODE 20070608
#define RUBY_PATCHLEVEL 0 #define RUBY_PATCHLEVEL 0
#define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MAJOR 1
@ -9,7 +9,7 @@
#define RUBY_VERSION_TEENY 0 #define RUBY_VERSION_TEENY 0
#define RUBY_RELEASE_YEAR 2007 #define RUBY_RELEASE_YEAR 2007
#define RUBY_RELEASE_MONTH 6 #define RUBY_RELEASE_MONTH 6
#define RUBY_RELEASE_DAY 7 #define RUBY_RELEASE_DAY 8
#ifdef RUBY_EXTERN #ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[]; RUBY_EXTERN const char ruby_version[];