diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | parse.y | 66 | ||||
| -rw-r--r-- | version.h | 6 |
3 files changed, 75 insertions, 4 deletions
@@ -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> * lib/secrand.rb: new file for secure random interface. @@ -2257,6 +2257,18 @@ 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 { /*%%%*/ @@ -2266,6 +2278,18 @@ 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 @@ -2297,7 +2321,20 @@ call_args2 : arg_value ',' args opt_block_arg $$ = NEW_LIST(NEW_HASH($1)); $$ = 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 @@ -2310,6 +2347,18 @@ 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 { /*%%%*/ @@ -2320,6 +2369,18 @@ 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 ; @@ -2371,6 +2432,9 @@ opt_block_arg : ',' block_arg $$ = $2; } | none + { + $$ = 0; + } ; args : arg_value @@ -1,7 +1,7 @@ #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_RELEASE_CODE 20070607 +#define RUBY_RELEASE_CODE 20070608 #define RUBY_PATCHLEVEL 0 #define RUBY_VERSION_MAJOR 1 @@ -9,7 +9,7 @@ #define RUBY_VERSION_TEENY 0 #define RUBY_RELEASE_YEAR 2007 #define RUBY_RELEASE_MONTH 6 -#define RUBY_RELEASE_DAY 7 +#define RUBY_RELEASE_DAY 8 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; |