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: parser_numbered_param

Browse source 
* parse.y (parser_numbered_param): hoisted out the contextual
  check for numbered parameters.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@67289 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2019-03-18 01:18:25 +00:00
parent 4161674b2f
commit d0e25ed277
1 changed files with 17 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

26
parse.y
View file

@ -7629,6 +7629,22 @@ parse_gvar(struct parser_params *p, const enum lex_state_e last_state)
return tGVAR; return tGVAR;
} }
static bool
parser_numbered_param(struct parser_params *p, unsigned long n)
{
if (DVARS_TERMINAL_P(p->lvtbl->args) || DVARS_TERMINAL_P(p->lvtbl->args->prev)) {
compile_error(p, "numbered parameter outside block");
return false;
}
if (p->max_numparam < 0) {
compile_error(p, "ordinary parameter is defined");
return false;
}
set_yylval_num((int)n);
SET_LEX_STATE(EXPR_ARG);
return true;
}
static enum yytokentype static enum yytokentype
parse_atmark(struct parser_params *p, const enum lex_state_e last_state) parse_atmark(struct parser_params *p, const enum lex_state_e last_state)
{ {
@ -7671,15 +7687,7 @@ parse_atmark(struct parser_params *p, const enum lex_state_e last_state)
else if (overflow || n > NUMPARAM_MAX) { else if (overflow || n > NUMPARAM_MAX) {
compile_error(p, "too large numbered parameter"); compile_error(p, "too large numbered parameter");
} }
else if (DVARS_TERMINAL_P(p->lvtbl->args) || DVARS_TERMINAL_P(p->lvtbl->args->prev)) { else if (parser_numbered_param(p, n)) {
compile_error(p, "numbered parameter outside block");
}
else if (p->max_numparam < 0) {
compile_error(p, "ordinary parameter is defined");
}
else {
set_yylval_num((int)n);
SET_LEX_STATE(EXPR_ARG);
return tNUMPARAM; return tNUMPARAM;
} }
} }