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 (block_param, f_args): add rules for the case arguments

Browse source 
begin with kwrest.  [ruby-core:42455][Bug #5989]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34998 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2012-03-13 06:17:08 +00:00
parent db83618d2c
commit d6a977f667
3 changed files with 27 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Tue Mar 13 15:17:03 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y (block_param, f_args): add rules for the case arguments
begin with kwrest. [ruby-core:42455][Bug #5989]
Tue Mar 13 12:37:53 2012 NARUSE, Yui <naruse@ruby-lang.org> Tue Mar 13 12:37:53 2012 NARUSE, Yui <naruse@ruby-lang.org>
* io.c (io_encoding_set): always warn if external encoding and internal * io.c (io_encoding_set): always warn if external encoding and internal

16
parse.y
View file

@ -3672,6 +3672,14 @@ block_param : f_arg ',' f_block_optarg ',' f_rest_arg ',' f_block_kwarg f_kwrest
$$ = params_new(Qnil, Qnil, Qnil, Qnil, $1, Qnil, escape_Qundef($2)); $$ = params_new(Qnil, Qnil, Qnil, Qnil, $1, Qnil, escape_Qundef($2));
%*/ %*/
} }
| tPOW tIDENTIFIER opt_f_block_arg
{
/*%%%*/
$$ = new_args(0, 0, 0, 0, 0, $2, $3);
/*%
$$ = params_new(Qnil, Qnil, Qnil, Qnil, Qnil, $2, escape_Qundef($3));
%*/
}
| f_block_arg | f_block_arg
{ {
/*%%%*/ /*%%%*/
@ -4994,6 +5002,14 @@ f_args : f_arg ',' f_optarg ',' f_rest_arg ',' f_kwarg f_kwrest opt_f_block_arg
$$ = params_new(Qnil, Qnil, Qnil, Qnil, $1, Qnil, escape_Qundef($2)); $$ = params_new(Qnil, Qnil, Qnil, Qnil, $1, Qnil, escape_Qundef($2));
%*/ %*/
} }
| tPOW tIDENTIFIER opt_f_block_arg
{
/*%%%*/
$$ = new_args(0, 0, 0, 0, 0, $2, $3);
/*%
$$ = params_new(Qnil, Qnil, Qnil, Qnil, Qnil, $2, escape_Qundef($3));
%*/
}
| f_block_arg | f_block_arg
{ {
/*%%%*/ /*%%%*/

6
test/ruby/test_syntax.rb
View file

@ -77,6 +77,12 @@ class TestSyntax < Test::Unit::TestCase
end end
end end
def test_keyword_rest
bug5989 = '[ruby-core:42455]'
assert_valid_syntax("def kwrest_test(**a) end", __FILE__)
assert_valid_syntax("def kwrest_test(**a, &b) end", __FILE__)
end
private private
def make_tmpsrc(f, src) def make_tmpsrc(f, src)