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

Warn also numbered parameter like methods

Browse Source
This commit is contained in:
Nobuyoshi Nakada 2019-12-20 08:18:19 +09:00
parent 3816cd945d
commit 2898367b3a
No known key found for this signature in database
GPG Key ID: 4BC7D6DF58D8DF60
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
parse.y
View File

@ -188,6 +188,7 @@ numparam_id_p(ID id)
unsigned int idx = NUMPARAM_ID_TO_IDX(id); unsigned int idx = NUMPARAM_ID_TO_IDX(id);
return idx > 0 && idx <= NUMPARAM_MAX; return idx > 0 && idx <= NUMPARAM_MAX;
} }
static void numparam_name(struct parser_params *p, ID id);
#define DVARS_INHERIT ((void*)1) #define DVARS_INHERIT ((void*)1)
#define DVARS_TOPSCOPE NULL #define DVARS_TOPSCOPE NULL
@ -2981,6 +2982,7 @@ primary : literal
} }
| k_def fname | k_def fname
{ {
numparam_name(p, get_id($2));
local_push(p, 0); local_push(p, 0);
$<id>$ = p->cur_arg; $<id>$ = p->cur_arg;
p->cur_arg = 0; p->cur_arg = 0;
@ -3007,6 +3009,7 @@ primary : literal
} }
| k_def singleton dot_or_colon {SET_LEX_STATE(EXPR_FNAME);} fname | k_def singleton dot_or_colon {SET_LEX_STATE(EXPR_FNAME);} fname
{ {
numparam_name(p, get_id($5));
$<num>4 = p->in_def; $<num>4 = p->in_def;
p->in_def = 1; p->in_def = 1;
SET_LEX_STATE(EXPR_ENDFN|EXPR_LABEL); /* force for args */ SET_LEX_STATE(EXPR_ENDFN|EXPR_LABEL); /* force for args */

2
test/ruby/test_syntax.rb
View File

@ -1441,6 +1441,8 @@ eom
assert_warn(/`_2' is used as numbered parameter/) {eval('_2=1')} assert_warn(/`_2' is used as numbered parameter/) {eval('_2=1')}
assert_warn(/`_3' is used as numbered parameter/) {eval('proc {|_3|}')} assert_warn(/`_3' is used as numbered parameter/) {eval('proc {|_3|}')}
assert_warn(/`_4' is used as numbered parameter/) {instance_eval('def x(_4) end')} assert_warn(/`_4' is used as numbered parameter/) {instance_eval('def x(_4) end')}
assert_warn(/`_5' is used as numbered parameter/) {instance_eval('def _5; end')}
assert_warn(/`_6' is used as numbered parameter/) {instance_eval('def self._6; end')}
assert_raise_with_message(NameError, /undefined local variable or method `_1'/) { assert_raise_with_message(NameError, /undefined local variable or method `_1'/) {
eval('_1') eval('_1')
} }