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

Extracted excessed_comma to unify ripper and make the order stable

Browse Source
This commit is contained in:
Nobuyoshi Nakada 2020-06-01 16:53:11 +09:00
parent 7b9527ce74
commit cadd2245f7
No known key found for this signature in database
GPG Key ID: 7CD2805BFA3770C6
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
parse.y
View File

@ -1143,7 +1143,7 @@ static int looking_at_eol_p(struct parser_params *p);
%type <id> cname fname op f_rest_arg f_block_arg opt_f_block_arg f_norm_arg f_bad_arg %type <id> cname fname op f_rest_arg f_block_arg opt_f_block_arg f_norm_arg f_bad_arg
%type <id> f_kwrest f_label f_arg_asgn call_op call_op2 reswords relop dot_or_colon %type <id> f_kwrest f_label f_arg_asgn call_op call_op2 reswords relop dot_or_colon
%type <id> p_kwrest p_kwnorest p_any_kwrest p_kw_label %type <id> p_kwrest p_kwnorest p_any_kwrest p_kw_label
%type <id> f_no_kwarg f_any_kwrest args_forward %type <id> f_no_kwarg f_any_kwrest args_forward excessed_comma
%token END_OF_INPUT 0 "end-of-input" %token END_OF_INPUT 0 "end-of-input"
%token <id> '.' %token <id> '.'
/* escaped chars, should be ignored otherwise */ /* escaped chars, should be ignored otherwise */
@ -3474,6 +3474,16 @@ opt_block_args_tail : ',' block_args_tail
} }
; ;
excessed_comma : ','
{
/* magic number for rest_id in iseq_set_arguments() */
/*%%%*/
$$ = NODE_SPECIAL_EXCESSIVE_COMMA;
/*% %*/
/*% ripper: excessed_comma! %*/
}
;
block_param : f_arg ',' f_block_optarg ',' f_rest_arg opt_block_args_tail block_param : f_arg ',' f_block_optarg ',' f_rest_arg opt_block_args_tail
{ {
$$ = new_args(p, $1, $3, $5, Qnone, $6, &@$); $$ = new_args(p, $1, $3, $5, Qnone, $6, &@$);
@ -3494,13 +3504,10 @@ block_param : f_arg ',' f_block_optarg ',' f_rest_arg opt_block_args_tail
{ {
$$ = new_args(p, $1, Qnone, $3, Qnone, $4, &@$); $$ = new_args(p, $1, Qnone, $3, Qnone, $4, &@$);
} }
| f_arg ',' | f_arg excessed_comma
{ {
/*%%%*/ $$ = new_args_tail(p, Qnone, Qnone, Qnone, &@2);
/* magic number for rest_id in iseq_set_arguments() */ $$ = new_args(p, $1, Qnone, $2, Qnone, $$, &@$);
$$ = new_args(p, $1, Qnone, NODE_SPECIAL_EXCESSIVE_COMMA, Qnone, new_args_tail(p, Qnone, Qnone, Qnone, &@1), &@$);
/*% %*/
/*% ripper: new_args(p, $1, Qnone, excessed_comma!, Qnone, new_args_tail(p, Qnone, Qnone, Qnone, NULL), NULL) %*/
} }
| f_arg ',' f_rest_arg ',' f_arg opt_block_args_tail | f_arg ',' f_rest_arg ',' f_arg opt_block_args_tail
{ {