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

Extract forwarding_arg_check function

Browse Source
This commit is contained in:
Nobuyoshi Nakada 2023-12-22 21:50:38 +09:00
parent 11c2aa035b
commit 40e3f782dd
1 changed files with 32 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
parse.y
View File

@ -1378,6 +1378,7 @@ static NODE *new_args_forward_call(struct parser_params*, NODE*, const YYLTYPE*,
#endif #endif
static int check_forwarding_args(struct parser_params*); static int check_forwarding_args(struct parser_params*);
static void add_forwarding_args(struct parser_params *p); static void add_forwarding_args(struct parser_params *p);
static void forwarding_arg_check(struct parser_params *p, ID arg, ID all, const char *var);
static const struct vtable *dyna_push(struct parser_params *); static const struct vtable *dyna_push(struct parser_params *);
static void dyna_pop(struct parser_params*, const struct vtable *); static void dyna_pop(struct parser_params*, const struct vtable *);
@ -3756,9 +3757,7 @@ block_arg : tAMPER arg_value
} }
| tAMPER | tAMPER
{ {
if (!local_id(p, idFWD_BLOCK)) { forwarding_arg_check(p, idFWD_BLOCK, 0, "block");
compile_error(p, "no anonymous block parameter");
}
/*%%%*/ /*%%%*/
$$ = NEW_BLOCK_PASS(NEW_LVAR(idFWD_BLOCK, &@1), &@$); $$ = NEW_BLOCK_PASS(NEW_LVAR(idFWD_BLOCK, &@1), &@$);
/*% %*/ /*% %*/
@ -3814,10 +3813,7 @@ arg_splat : tSTAR arg_value
} }
| tSTAR /* none */ | tSTAR /* none */
{ {
if (!local_id(p, idFWD_REST) || forwarding_arg_check(p, idFWD_REST, idFWD_ALL, "rest");
local_id(p, idFWD_ALL)) {
compile_error(p, "no anonymous rest parameter");
}
/*%%%*/ /*%%%*/
$$ = NEW_LVAR(idFWD_REST, &@1); $$ = NEW_LVAR(idFWD_REST, &@1);
/*% %*/ /*% %*/
@ -6689,10 +6685,7 @@ assoc : arg_value tASSOC arg_value
} }
| tDSTAR | tDSTAR
{ {
if (!local_id(p, idFWD_KWREST) || forwarding_arg_check(p, idFWD_KWREST, idFWD_ALL, "keyword rest");
local_id(p, idFWD_ALL)) {
compile_error(p, "no anonymous keyword rest parameter");
}
/*%%%*/ /*%%%*/
$$ = list_append(p, NEW_LIST(0, &@$), $$ = list_append(p, NEW_LIST(0, &@$),
NEW_LVAR(idFWD_KWREST, &@$)); NEW_LVAR(idFWD_KWREST, &@$));
@ -15013,6 +15006,34 @@ add_forwarding_args(struct parser_params *p)
arg_var(p, idFWD_ALL); arg_var(p, idFWD_ALL);
} }
static void
forwarding_arg_check(struct parser_params *p, ID arg, ID all, const char *var)
{
struct vtable *vars, *args;
vars = p->lvtbl->vars;
args = p->lvtbl->args;
while (vars && !DVARS_TERMINAL_P(vars->prev)) {
vars = vars->prev;
args = args->prev;
}
bool found = false;
if (vars && vars->prev == DVARS_INHERIT) {
found = (rb_local_defined(arg, p->parent_iseq) &&
!(all && rb_local_defined(all, p->parent_iseq)));
}
else {
found = (vtable_included(args, arg) &&
!(all && vtable_included(args, all)));
}
if (!found) {
compile_error(p, "no anonymous %s parameter", var);
}
}
#ifndef RIPPER #ifndef RIPPER
static NODE * static NODE *
new_args_forward_call(struct parser_params *p, NODE *leading, const YYLTYPE *loc, const YYLTYPE *argsloc) new_args_forward_call(struct parser_params *p, NODE *leading, const YYLTYPE *loc, const YYLTYPE *argsloc)