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

parse.y: no duplicated names

Browse Source 
* parse.y (new_bv_gen): no duplicated names, if already added in
  shadowing_lvar().

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45846 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2014-05-06 14:29:07 +00:00
parent d750b62d66
commit b5cae3820b
3 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,4 +1,7 @@
Tue May 6 23:28:47 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> Tue May 6 23:29:05 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y (new_bv_gen): no duplicated names, if already added in
shadowing_lvar().
* parse.y (local_tbl_gen): remove local variables duplicated with * parse.y (local_tbl_gen): remove local variables duplicated with
arguments. arguments.

16
parse.y
View File

@ -8761,10 +8761,10 @@ is_private_local_id(ID name)
#define LVAR_USED ((ID)1 << (sizeof(ID) * CHAR_BIT - 1)) #define LVAR_USED ((ID)1 << (sizeof(ID) * CHAR_BIT - 1))
static ID static int
shadowing_lvar_gen(struct parser_params *parser, ID name) shadowing_lvar_0(struct parser_params *parser, ID name)
{ {
if (is_private_local_id(name)) return name; if (is_private_local_id(name)) return 1;
if (dyna_in_block()) { if (dyna_in_block()) {
if (dvar_curr(name)) { if (dvar_curr(name)) {
yyerror("duplicated argument name"); yyerror("duplicated argument name");
@ -8775,6 +8775,7 @@ shadowing_lvar_gen(struct parser_params *parser, ID name)
if (lvtbl->used) { if (lvtbl->used) {
vtable_add(lvtbl->used, (ID)ruby_sourceline | LVAR_USED); vtable_add(lvtbl->used, (ID)ruby_sourceline | LVAR_USED);
} }
return 0;
} }
} }
else { else {
@ -8782,6 +8783,13 @@ shadowing_lvar_gen(struct parser_params *parser, ID name)
yyerror("duplicated argument name"); yyerror("duplicated argument name");
} }
} }
return 1;
}
static ID
shadowing_lvar_gen(struct parser_params *parser, ID name)
{
shadowing_lvar_0(parser, name);
return name; return name;
} }
@ -8794,7 +8802,7 @@ new_bv_gen(struct parser_params *parser, ID name)
rb_id2name(name)); rb_id2name(name));
return; return;
} }
shadowing_lvar(name); if (!shadowing_lvar_0(parser, name)) return;
dyna_var(name); dyna_var(name);
} }

6
test/ruby/test_variable.rb
View File

@ -89,6 +89,12 @@ class TestVariable < Test::Unit::TestCase
assert_equal([:x, :bug9486, :x], x) assert_equal([:x, :bug9486, :x], x)
end end
def test_shadowing_block_local_variables
bug9486 = '[ruby-core:60501] [Bug #9486]'
x = tap {|;x| break local_variables}
assert_equal([:x, :bug9486, :x], x)
end
def local_variables_of(bind) def local_variables_of(bind)
this_should_not_be_in_bind = 2 this_should_not_be_in_bind = 2
bind.local_variables bind.local_variables