github
/
ruby
зеркало из https://github.com/github/ruby.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

* parse.y (f_block_optarg): allow default for block parameters as 

long as the value is primary.  a patch from Eric Mahurin
  <eric.mahurin at gmail.com> in [ruby-core:16880].

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19199 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2008-09-06 18:39:36 +00:00
Родитель 04d3593b26
Коммит 929e0b91be
3 изменённых файлов: 168 добавлений и 1 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

6
ChangeLog
Просмотреть файл

@ -1,3 +1,9 @@
Sun Sep 7 03:37:05 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* parse.y (f_block_optarg): allow default for block parameters as
long as the value is primary. a patch from Eric Mahurin
<eric.mahurin at gmail.com> in [ruby-core:16880].
Sun Sep 7 01:07:10 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* parse.y (yylex): "1.upto 2 {|i| p i }" should be syntax error.

105
parse.y
Просмотреть файл

@ -673,6 +673,7 @@ static void token_info_pop(struct parser_params*, const char *token);
%type <node> paren_args opt_paren_args
%type <node> command_args aref_args opt_block_arg block_arg var_ref var_lhs
%type <node> mrhs superclass block_call block_command
%type <node> f_block_optarg f_block_opt
%type <node> f_arglist f_args f_arg f_arg_item f_optarg f_marg f_marg_list f_margs
%type <node> assoc_list assocs assoc undef_list backref string_dvar for_var
%type <node> block_param opt_block_param block_param_def f_opt
@ -3206,7 +3207,39 @@ f_margs : f_marg_list
}
;
block_param : f_arg ',' f_rest_arg opt_f_block_arg
block_param : f_arg ',' f_block_optarg ',' f_rest_arg opt_f_block_arg
{
/*%%%*/
$$ = new_args($1, $3, $5, 0, $6);
/*%
$$ = params_new($1, $3, $5, Qnil, escape_Qundef($6));
%*/
}
| f_arg ',' f_block_optarg ',' f_rest_arg ',' f_arg opt_f_block_arg
{
/*%%%*/
$$ = new_args($1, $3, $5, $7, $8);
/*%
$$ = params_new($1, $3, $5, $7, escape_Qundef($8));
%*/
}
| f_arg ',' f_block_optarg opt_f_block_arg
{
/*%%%*/
$$ = new_args($1, $3, 0, 0, $4);
/*%
$$ = params_new($1, $3, Qnil, Qnil, escape_Qundef($4));
%*/
}
| f_arg ',' f_block_optarg ',' f_arg opt_f_block_arg
{
/*%%%*/
$$ = new_args($1, $3, 0, $5, $6);
/*%
$$ = params_new($1, $3, Qnil, $5, escape_Qundef($6));
%*/
}
| f_arg ',' f_rest_arg opt_f_block_arg
{
/*%%%*/
$$ = new_args($1, 0, $3, 0, $4);
@ -3239,6 +3272,38 @@ block_param : f_arg ',' f_rest_arg opt_f_block_arg
$$ = params_new($1, Qnil,Qnil, Qnil, escape_Qundef($2));
%*/
}
| f_block_optarg ',' f_rest_arg opt_f_block_arg
{
/*%%%*/
$$ = new_args(0, $1, $3, 0, $4);
/*%
$$ = params_new(Qnil, $1, $3, Qnil, escape_Qundef($4));
%*/
}
| f_block_optarg ',' f_rest_arg ',' f_arg opt_f_block_arg
{
/*%%%*/
$$ = new_args(0, $1, $3, $5, $6);
/*%
$$ = params_new(Qnil, $1, $3, $5, escape_Qundef($6));
%*/
}
| f_block_optarg opt_f_block_arg
{
/*%%%*/
$$ = new_args(0, $1, 0, 0, $2);
/*%
$$ = params_new(Qnil, $1, Qnil, Qnil,escape_Qundef($2));
%*/
}
| f_block_optarg ',' f_arg opt_f_block_arg
{
/*%%%*/
$$ = new_args(0, $1, 0, $3, $4);
/*%
$$ = params_new(Qnil, $1, Qnil, $3, escape_Qundef($4));
%*/
}
| f_rest_arg opt_f_block_arg
{
/*%%%*/
@ -4339,6 +4404,44 @@ f_opt : tIDENTIFIER '=' arg_value
}
;
f_block_opt : tIDENTIFIER '=' primary_value
{
/*%%%*/
if (!is_local_id($1))
yyerror("formal argument must be local variable");
shadowing_lvar($1);
arg_var($1);
$$ = NEW_OPT_ARG(0, assignable($1, $3));
/*%
$$ = rb_assoc_new($1, $3);
%*/
}
;
f_block_optarg : f_block_opt
{
/*%%%*/
$$ = $1;
/*%
$$ = rb_ary_new3(1, $1);
%*/
}
| f_block_optarg ',' f_block_opt
{
/*%%%*/
NODE *opts = $1;
while (opts->nd_next) {
opts = opts->nd_next;
}
opts->nd_next = $3;
$$ = $1;
/*%
$$ = rb_ary_push($1, $3);
%*/
}
;
f_optarg : f_opt
{
/*%%%*/

58
sample/test.rb
Просмотреть файл

@ -296,6 +296,64 @@ test_ok(f.call([[42]]) == [[[42]]])
test_ok(f.call([42,55]) == [[42,55]])
test_ok(f.call(42,55) == [42,55])
f = lambda { |a, b=42, *c| [a,b,c] }
test_ok(f.call(1 ) == [1,42,[ ]] )
test_ok(f.call(1,43 ) == [1,43,[ ]] )
test_ok(f.call(1,43,44) == [1,43,[44]] )
f = lambda { |a, b=(a|16), *c, &block| [a,b,c,block&&block[]] }
test_ok(f.call(8 ) == [8,24,[ ],nil] )
test_ok(f.call(8,43 ) == [8,43,[ ],nil] )
test_ok(f.call(8,43,44) == [8,43,[44],nil] )
test_ok(f.call(8 ){45} == [8,24,[ ],45 ] )
test_ok(f.call(8,43 ){45} == [8,43,[ ],45 ] )
test_ok(f.call(8,43,44){45} == [8,43,[44],45 ] )
f = lambda { |a, b=42, *c, d| [a,b,c,d] }
test_ok(f.call(1 ,99) == [1,42,[ ],99] )
test_ok(f.call(1,43 ,99) == [1,43,[ ],99] )
test_ok(f.call(1,43,44,99) == [1,43,[44],99] )
f = lambda { |a, b=(a|16), &block| [a,b,block&&block[]] }
test_ok(f.call(8 ) == [8,24,nil] )
test_ok(f.call(8,43) == [8,43,nil] )
test_ok(f.call(8,43) == [8,43,nil] )
test_ok(f.call(8 ){45} == [8,24,45 ] )
test_ok(f.call(8,43){45} == [8,43,45 ] )
test_ok(f.call(8,43){45} == [8,43,45 ] )
f = lambda { |a, b=42, d| [a,b,d] }
test_ok(f.call(1 ,99) == [1,42,99] )
test_ok(f.call(1,43,99) == [1,43,99] )
test_ok(f.call(1,43,99) == [1,43,99] )
f = lambda { |b=42, *c, &block| [b,c,block&&block[]] }
test_ok(f.call( ) == [42,[ ],nil] )
test_ok(f.call(43 ) == [43,[ ],nil] )
test_ok(f.call(43,44) == [43,[44],nil] )
test_ok(f.call( ){45} == [42,[ ],45 ] )
test_ok(f.call(43 ){45} == [43,[ ],45 ] )
test_ok(f.call(43,44){45} == [43,[44],45 ] )
f = lambda { |b=42, *c, d| [b,c,d] }
test_ok(f.call( 99) == [42,[ ],99] )
test_ok(f.call(43 ,99) == [43,[ ],99] )
test_ok(f.call(43,44,99) == [43,[44],99] )
f = lambda { |b=42, &block| [b,block&&block[]] }
test_ok(f.call( ) == [42,nil] )
test_ok(f.call(43) == [43,nil] )
test_ok(f.call(43) == [43,nil] )
test_ok(f.call( ){45} == [42,45 ] )
test_ok(f.call(43){45} == [43,45 ] )
test_ok(f.call(43){45} == [43,45 ] )
f = lambda { |b=42, d| [b,d] }
test_ok(f.call( 99) == [42,99] )
test_ok(f.call(43,99) == [43,99] )
test_ok(f.call(43,99) == [43,99] )
a,=*[1]
test_ok(a == 1)
a,=*[[1]]