diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | parse.y | 31 | ||||
| -rw-r--r-- | test/ruby/test_variable.rb | 6 | ||||
| -rw-r--r-- | version.h | 6 |
4 files changed, 28 insertions, 21 deletions
@@ -1,5 +1,11 @@ +Mon Jul 7 11:47:51 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * parse.y (local_tbl_gen): remove local variables duplicated with + arguments. + Thu Jul 3 15:17:22 2014 Koichi Sasada <ko1@atdot.net> + [ruby-core:60501] [Bug #9486] * vm.c (rb_vm_pop_cfunc_frame): added. It cares c_return event. The patch base by drkaes (Stefan Kaes). [Bug #9321] @@ -9564,30 +9564,25 @@ local_pop_gen(struct parser_params *parser) #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* 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; if (cnt <= 0) return 0; buf = ALLOC_N(ID, cnt + 1); - vtable_tblcpy(buf+1, lvtbl->args); - vtable_tblcpy(buf+vtable_size(lvtbl->args)+1, lvtbl->vars); + MEMCPY(buf+1, lvtbl->args->tbl, ID, cnt_args); + /* 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; return buf; } diff --git a/test/ruby/test_variable.rb b/test/ruby/test_variable.rb index 32b3d61573..a7cdd57c02 100644 --- a/test/ruby/test_variable.rb +++ b/test/ruby/test_variable.rb @@ -83,6 +83,12 @@ class TestVariable < Test::Unit::TestCase end.call 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 test_global_variable_0 assert_in_out_err(["-e", "$0='t'*1000;print $0"], "", /\At+\z/, []) end @@ -1,10 +1,10 @@ #define RUBY_VERSION "2.0.0" -#define RUBY_RELEASE_DATE "2014-07-04" -#define RUBY_PATCHLEVEL 515 +#define RUBY_RELEASE_DATE "2014-07-07" +#define RUBY_PATCHLEVEL 516 #define RUBY_RELEASE_YEAR 2014 #define RUBY_RELEASE_MONTH 7 -#define RUBY_RELEASE_DAY 4 +#define RUBY_RELEASE_DAY 7 #include "ruby/version.h" |