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

Added implicit block parameter

Browse Source
This commit is contained in:
Nobuyoshi Nakada 2019-08-24 02:21:30 +09:00
parent a1dcb9daa5
commit e73cc3eead
Notes: git 2019-09-24 21:58:18 +09:00 
Merged: https://github.com/ruby/ruby/pull/2431
1 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
parse.y
View File

@ -168,6 +168,7 @@ struct local_vars {
}; };
enum { enum {
IMPLICIT_PARAM = -2,
ORDINAL_PARAM = -1, ORDINAL_PARAM = -1,
NO_PARAM = 0, NO_PARAM = 0,
NUMPARAM_MAX = 9, NUMPARAM_MAX = 9,
@ -8483,12 +8484,24 @@ static bool
parser_numbered_param(struct parser_params *p, unsigned long n) parser_numbered_param(struct parser_params *p, unsigned long n)
{ {
if (DVARS_TERMINAL_P(p->lvtbl->args) || DVARS_TERMINAL_P(p->lvtbl->args->prev)) { if (DVARS_TERMINAL_P(p->lvtbl->args) || DVARS_TERMINAL_P(p->lvtbl->args->prev)) {
compile_error(p, "numbered parameter outside block"); compile_error(p, "implicit parameter outside block");
return false; return false;
} }
if (p->max_numparam < NO_PARAM) { if (p->max_numparam < NO_PARAM) {
compile_error(p, "ordinary parameter is defined"); if (p->max_numparam == ORDINAL_PARAM) {
return false; compile_error(p, "ordinary parameter is defined");
return false;
}
else if (n > 0) {
compile_error(p, "implicit parameter is used");
return false;
}
}
else if (p->max_numparam > NO_PARAM) {
if (n == 0) {
compile_error(p, "numbered parameter is used");
return false;
}
} }
set_yylval_name(numparam_id(p, (int)n)); set_yylval_name(numparam_id(p, (int)n));
SET_LEX_STATE(EXPR_ARG); SET_LEX_STATE(EXPR_ARG);
@ -11228,10 +11241,15 @@ new_args_tail(struct parser_params *p, NODE *kw_args, ID kw_rest_arg, ID block,
static NODE * static NODE *
args_with_numbered(struct parser_params *p, NODE *args, int max_numparam) args_with_numbered(struct parser_params *p, NODE *args, int max_numparam)
{ {
if (max_numparam > NO_PARAM) { if (max_numparam > NO_PARAM || max_numparam == IMPLICIT_PARAM) {
if (!args) args = new_args_tail(p, 0, 0, 0, 0); if (!args) args = new_args_tail(p, 0, 0, 0, 0);
args->nd_ainfo->pre_args_num = max_numparam; if (max_numparam == IMPLICIT_PARAM) {
args->nd_ainfo->rest_arg = NODE_SPECIAL_EXCESSIVE_COMMA; args->nd_ainfo->pre_args_num = 1;
}
else {
args->nd_ainfo->pre_args_num = max_numparam;
args->nd_ainfo->rest_arg = NODE_SPECIAL_EXCESSIVE_COMMA;
}
} }
return args; return args;
} }
@ -11240,8 +11258,12 @@ ID
rb_parser_numparam_id(struct parser_params *p, int idx) rb_parser_numparam_id(struct parser_params *p, int idx)
{ {
struct vtable *args; struct vtable *args;
if (idx <= 0) return (ID)0; if (idx < 0) return (ID)0;
if (p->max_numparam < idx) { else if (idx == 0) {
p->max_numparam = IMPLICIT_PARAM;
idx = 1;
}
else if (p->max_numparam < idx) {
p->max_numparam = idx; p->max_numparam = idx;
} }
args = p->lvtbl->args; args = p->lvtbl->args;