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

* parse.y (shadowing_lvar_gen): get rid of adding extra name for

Browse Source 
shadowing local variable.  [ruby-dev:41628]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28364 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2010-06-20 05:41:07 +00:00
parent 7a8a264f1d
commit 47fb01e35b
4 changed files with 76 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ChangeLog
View File

@ -1,3 +1,8 @@
Sun Jun 20 14:40:50 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y (shadowing_lvar_gen): get rid of adding extra name for
shadowing local variable. [ruby-dev:41628]
Sat Jun 19 11:11:37 2010 Yukihiro Matsumoto <matz@ruby-lang.org> Sat Jun 19 11:11:37 2010 Yukihiro Matsumoto <matz@ruby-lang.org>
* lib/irb.rb: remove double exclamation marks. a patch from Diego * lib/irb.rb: remove double exclamation marks. a patch from Diego
@ -75,6 +80,15 @@ Thu Jun 17 18:37:47 2010 NAKAMURA Usaku <usa@ruby-lang.org>
* transcode.c (rb_str_encode): should return new string always. * transcode.c (rb_str_encode): should return new string always.
fixed #3444. fixed #3444.
Wed Jun 16 18:34:54 2010 NAKAMURA Usaku <usa@ruby-lang.org>
* parse.y: ripper needs warn_unused_var(), too.
Wed Jun 16 18:20:00 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y (warn_unused_var): warn unused variables.
[ruby-dev:41620]
Wed Jun 16 15:40:53 2010 NAKAMURA Usaku <usa@ruby-lang.org> Wed Jun 16 15:40:53 2010 NAKAMURA Usaku <usa@ruby-lang.org>
* error.c (rb_bug): existence of _set_abort_behavior() depends on * error.c (rb_bug): existence of _set_abort_behavior() depends on

61
parse.y
View File

@ -99,6 +99,7 @@ struct vtable {
struct local_vars { struct local_vars {
struct vtable *args; struct vtable *args;
struct vtable *vars; struct vtable *vars;
struct vtable *used;
struct local_vars *prev; struct local_vars *prev;
}; };
@ -167,7 +168,7 @@ vtable_included(const struct vtable * tbl, ID id)
if (POINTER_P(tbl)) { if (POINTER_P(tbl)) {
for (i = 0; i < tbl->pos; i++) { for (i = 0; i < tbl->pos; i++) {
if (tbl->tbl[i] == id) { if (tbl->tbl[i] == id) {
return 1; return i+1;
} }
} }
} }
@ -8238,7 +8239,6 @@ shadowing_lvar_gen(struct parser_params *parser, ID name)
} }
else if (dvar_defined(name) || local_id(name)) { else if (dvar_defined(name) || local_id(name)) {
rb_warningS("shadowing outer local variable - %s", rb_id2name(name)); rb_warningS("shadowing outer local variable - %s", rb_id2name(name));
vtable_add(lvtbl->vars, name);
} }
} }
else { else {
@ -8918,6 +8918,27 @@ new_args_gen(struct parser_params *parser, NODE *m, NODE *o, ID r, NODE *p, ID b
} }
#endif /* !RIPPER */ #endif /* !RIPPER */
#define LVAR_USED (1UL << (sizeof(ID) * CHAR_BIT - 1))
static void
warn_unused_var(struct parser_params *parser, struct local_vars *local)
{
int i, cnt;
ID *v, *u;
if (!local->used) return;
v = local->vars->tbl;
u = local->used->tbl;
cnt = local->used->pos;
if (cnt != local->vars->pos) {
rb_bug("local->used->pos != local->vars->pos");
}
for (i = 0; i < cnt; ++i) {
if (!v[i] || (u[i] & LVAR_USED)) continue;
rb_compile_warn(ruby_sourcefile, (int)u[i], "assigned but unused variable %s", rb_id2name(v[i]));
}
}
static void static void
local_push_gen(struct parser_params *parser, int inherit_dvars) local_push_gen(struct parser_params *parser, int inherit_dvars)
{ {
@ -8927,6 +8948,7 @@ local_push_gen(struct parser_params *parser, int inherit_dvars)
local->prev = lvtbl; local->prev = lvtbl;
local->args = vtable_alloc(0); local->args = vtable_alloc(0);
local->vars = vtable_alloc(inherit_dvars ? DVARS_INHERIT : DVARS_TOPSCOPE); local->vars = vtable_alloc(inherit_dvars ? DVARS_INHERIT : DVARS_TOPSCOPE);
local->used = RTEST(ruby_verbose) ? vtable_alloc(0) : 0;
lvtbl = local; lvtbl = local;
} }
@ -8934,6 +8956,10 @@ static void
local_pop_gen(struct parser_params *parser) local_pop_gen(struct parser_params *parser)
{ {
struct local_vars *local = lvtbl->prev; struct local_vars *local = lvtbl->prev;
if (lvtbl->used) {
warn_unused_var(parser, lvtbl);
vtable_free(lvtbl->used);
}
vtable_free(lvtbl->args); vtable_free(lvtbl->args);
vtable_free(lvtbl->vars); vtable_free(lvtbl->vars);
xfree(lvtbl); xfree(lvtbl);
@ -8982,28 +9008,37 @@ static int
local_var_gen(struct parser_params *parser, ID id) local_var_gen(struct parser_params *parser, ID id)
{ {
vtable_add(lvtbl->vars, id); vtable_add(lvtbl->vars, id);
if (lvtbl->used) {
vtable_add(lvtbl->used, (ID)ruby_sourceline);
}
return vtable_size(lvtbl->vars) - 1; return vtable_size(lvtbl->vars) - 1;
} }
static int static int
local_id_gen(struct parser_params *parser, ID id) local_id_gen(struct parser_params *parser, ID id)
{ {
struct vtable *vars, *args; struct vtable *vars, *args, *used;
vars = lvtbl->vars; vars = lvtbl->vars;
args = lvtbl->args; args = lvtbl->args;
used = lvtbl->used;
while (vars && POINTER_P(vars->prev)) { while (vars && POINTER_P(vars->prev)) {
vars = vars->prev; vars = vars->prev;
args = args->prev; args = args->prev;
if (used) used = used->prev;
} }
if (vars && vars->prev == DVARS_INHERIT) { if (vars && vars->prev == DVARS_INHERIT) {
return rb_local_defined(id); return rb_local_defined(id);
} }
else if (vtable_included(args, id)) {
return 1;
}
else { else {
return (vtable_included(args, id) || int i = vtable_included(vars, id);
vtable_included(vars, id)); if (i && used) used->tbl[i-1] |= LVAR_USED;
return i != 0;
} }
} }
@ -9012,6 +9047,9 @@ dyna_push_gen(struct parser_params *parser)
{ {
lvtbl->args = vtable_alloc(lvtbl->args); lvtbl->args = vtable_alloc(lvtbl->args);
lvtbl->vars = vtable_alloc(lvtbl->vars); lvtbl->vars = vtable_alloc(lvtbl->vars);
if (lvtbl->used) {
lvtbl->used = vtable_alloc(lvtbl->used);
}
return lvtbl->args; return lvtbl->args;
} }
@ -9020,6 +9058,11 @@ dyna_pop_1(struct parser_params *parser)
{ {
struct vtable *tmp; struct vtable *tmp;
if ((tmp = lvtbl->used) != 0) {
warn_unused_var(parser, lvtbl);
lvtbl->used = lvtbl->used->prev;
vtable_free(tmp);
}
tmp = lvtbl->args; tmp = lvtbl->args;
lvtbl->args = lvtbl->args->prev; lvtbl->args = lvtbl->args->prev;
vtable_free(tmp); vtable_free(tmp);
@ -9051,20 +9094,24 @@ dyna_in_block_gen(struct parser_params *parser)
static int static int
dvar_defined_gen(struct parser_params *parser, ID id) dvar_defined_gen(struct parser_params *parser, ID id)
{ {
struct vtable *vars, *args; struct vtable *vars, *args, *used;
int i;
args = lvtbl->args; args = lvtbl->args;
vars = lvtbl->vars; vars = lvtbl->vars;
used = lvtbl->used;
while (POINTER_P(vars)) { while (POINTER_P(vars)) {
if (vtable_included(args, id)) { if (vtable_included(args, id)) {
return 1; return 1;
} }
if (vtable_included(vars, id)) { if ((i = vtable_included(vars, id)) != 0) {
if (used) used->tbl[i-1] |= LVAR_USED;
return 1; return 1;
} }
args = args->prev; args = args->prev;
vars = vars->prev; vars = vars->prev;
if (used) used = used->prev;
} }
if (vars == DVARS_INHERIT) { if (vars == DVARS_INHERIT) {

6
test/ruby/test_rubyoptions.rb
View File

@ -415,4 +415,10 @@ class TestRubyOptions < Test::Unit::TestCase
ensure ensure
t.close(true) if t t.close(true) if t
end end
def test_unused_variable
feature3446 = '[ruby-dev:41620]'
assert_in_out_err(["-we", "a=1"], "", [], ["-e:1: warning: assigned but unused variable - a"], feature3446)
assert_in_out_err(["-we", "1.times do\n a=1\nend"], "", [], ["-e:2: warning: assigned but unused variable - a"], feature3446)
end
end end

4
version.h
View File

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.3" #define RUBY_VERSION "1.9.3"
#define RUBY_RELEASE_DATE "2010-06-19" #define RUBY_RELEASE_DATE "2010-06-20"
#define RUBY_PATCHLEVEL -1 #define RUBY_PATCHLEVEL -1
#define RUBY_BRANCH_NAME "trunk" #define RUBY_BRANCH_NAME "trunk"
@ -8,7 +8,7 @@
#define RUBY_VERSION_TEENY 1 #define RUBY_VERSION_TEENY 1
#define RUBY_RELEASE_YEAR 2010 #define RUBY_RELEASE_YEAR 2010
#define RUBY_RELEASE_MONTH 6 #define RUBY_RELEASE_MONTH 6
#define RUBY_RELEASE_DAY 19 #define RUBY_RELEASE_DAY 20
#include "ruby/version.h" #include "ruby/version.h"