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: remove duplicated names

Browse source 
* parse.y (local_tbl_gen): remove local variables duplicated with
  arguments.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45845 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2014-05-06 14:28:48 +00:00
parent 8a57bb7b4a
commit d750b62d66
3 changed files with 24 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Tue May 6 23:28:47 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y (local_tbl_gen): remove local variables duplicated with
arguments.
Tue May 6 18:48:50 2014 Tanaka Akira <akr@fsij.org> Tue May 6 18:48:50 2014 Tanaka Akira <akr@fsij.org>
* lib/time.rb (Time.make_time): Adjust the time zone of "now". * lib/time.rb (Time.make_time): Adjust the time zone of "now".

31
parse.y
View file

@ -9714,31 +9714,26 @@ local_pop_gen(struct parser_params *parser)
} }
#ifndef RIPPER #ifndef RIPPER
static ID*
vtable_tblcpy(ID *buf, const struct vtable *src)
{
int i, cnt = vtable_size(src);
if (cnt > 0) {
buf[0] = cnt;
for (i = 0; i < cnt; i++) {
buf[i] = src->tbl[i];
}
return buf;
}
return 0;
}
static ID* static ID*
local_tbl_gen(struct parser_params *parser) local_tbl_gen(struct parser_params *parser)
{ {
int cnt = vtable_size(lvtbl->args) + vtable_size(lvtbl->vars); int cnt_args = vtable_size(lvtbl->args);
int cnt_vars = vtable_size(lvtbl->vars);
int cnt = cnt_args + cnt_vars;
int i, j;
ID *buf; ID *buf;
if (cnt <= 0) return 0; if (cnt <= 0) return 0;
buf = ALLOC_N(ID, cnt + 1); buf = ALLOC_N(ID, cnt + 1);
vtable_tblcpy(buf+1, lvtbl->args); MEMCPY(buf+1, lvtbl->args->tbl, ID, cnt_args);
vtable_tblcpy(buf+vtable_size(lvtbl->args)+1, lvtbl->vars); /* remove IDs duplicated to warn shadowing */
for (i = 0, j = cnt_args+1; i < cnt_vars; ++i) {
ID id = lvtbl->vars->tbl[i];
if (!vtable_included(lvtbl->args, id)) {
buf[j++] = id;
}
}
if (--j < cnt) REALLOC_N(buf, ID, (cnt = j) + 1);
buf[0] = cnt; buf[0] = cnt;
return buf; return buf;
} }

6
test/ruby/test_variable.rb
View file

@ -83,6 +83,12 @@ class TestVariable < Test::Unit::TestCase
end.call end.call
end end
def test_shadowing_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