reverted to r30124; r30124 breaks test

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30141 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

4 files changed, 67 insertions, 93 deletions

diff --git a/ChangeLog b/ChangeLog
index 865afcd5ce..89962d2dea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,13 +1,3 @@
-Wed Dec  8 07:29:43 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (struct vtable, struct local_vars, vtable_add):
-	  restructued to add declared line.  [ruby-dev:42718]
-
-	* parse.y (shadowing_lvar_gen): should not add dvar to vars.
-
-	* parse.y (local_push_gen, local_id_gen, dvar_defined_gen): check
-	  local variable usage for args and vars respectedly.
-
 Tue Dec  7 22:37:15 2010  Masaya Tarui  <tarui@ruby-lnag.org>
 
 	* io.c (io_read): duplicate string if shared. [ruby-dev:42719]
diff --git a/parse.y b/parse.y
index 07ad847b4e..deda492204 100644
--- a/parse.y
+++ b/parse.y
@@ -10,10 +10,7 @@
 **********************************************************************/
 
 %{
-#if 0
-}
 
-#endif
 #define YYDEBUG 1
 #define YYERROR_VERBOSE 1
 #define YYSTACK_USE_ALLOCA 0
@@ -94,7 +91,6 @@ typedef VALUE stack_type;
 
 struct vtable {
     ID *tbl;
-    int *line;
     int pos;
     int capa;
     struct vtable *prev;
@@ -103,6 +99,7 @@ struct vtable {
 struct local_vars {
     struct vtable *args;
     struct vtable *vars;
+    struct vtable *used;
     struct local_vars *prev;
 };
 
@@ -125,13 +122,12 @@ vtable_size(const struct vtable *tbl)
 #define VTBL_DEBUG 0
 
 static struct vtable *
-vtable_alloc(struct vtable *prev, int usage)
+vtable_alloc(struct vtable *prev)
 {
     struct vtable *tbl = ALLOC(struct vtable);
     tbl->pos = 0;
     tbl->capa = 8;
     tbl->tbl = ALLOC_N(ID, tbl->capa);
-    tbl->line = usage ? ALLOC_N(int, tbl->capa) : 0;
     tbl->prev = prev;
     if (VTBL_DEBUG) printf("vtable_alloc: %p\n", (void *)tbl);
     return tbl;
@@ -145,35 +141,23 @@ vtable_free(struct vtable *tbl)
         if (tbl->tbl) {
             xfree(tbl->tbl);
         }
-        if (tbl->line) {
-            xfree(tbl->line);
-        }
         xfree(tbl);
     }
 }
 
-static int
-vtable_add(struct vtable *tbl, ID id, int line)
+static void
+vtable_add(struct vtable *tbl, ID id)
 {
-    int idx;
-
     if (!POINTER_P(tbl)) {
         rb_bug("vtable_add: vtable is not allocated (%p)", (void *)tbl);
     }
-    if (VTBL_DEBUG)
-	printf("vtable_add: %p, %s, %d\n", (void *)tbl, rb_id2name(id), line);
+    if (VTBL_DEBUG) printf("vtable_add: %p, %s\n", (void *)tbl, rb_id2name(id));
 
     if (tbl->pos == tbl->capa) {
         tbl->capa = tbl->capa * 2;
         REALLOC_N(tbl->tbl, ID, tbl->capa);
-	if (tbl->line) REALLOC_N(tbl->line, int, tbl->capa);
-    }
-    idx = tbl->pos++;
-    if (tbl->line) {
-	tbl->line[idx] = line;
     }
-    tbl->tbl[idx] = id;
-    return idx;
+    tbl->tbl[tbl->pos++] = id;
 }
 
 static int
@@ -474,9 +458,8 @@ static void dyna_pop_gen(struct parser_params*, const struct vtable *);
 static int dyna_in_block_gen(struct parser_params*);
 #define dyna_in_block() dyna_in_block_gen(parser)
 #define dyna_var(id) local_var(id)
-static int dvar_defined_gen(struct parser_params*,ID,int);
-#define dvar_get_defined(id) dvar_defined_gen(parser, id, 0)
-#define dvar_defined(id) dvar_defined_gen(parser, id, 1)
+static int dvar_defined_gen(struct parser_params*,ID);
+#define dvar_defined(id) dvar_defined_gen(parser, id)
 static int dvar_curr_gen(struct parser_params*,ID);
 #define dvar_curr(id) dvar_curr_gen(parser, id)
 
@@ -624,9 +607,6 @@ static void token_info_pop(struct parser_params*, const char *token);
 #define token_info_push(token) /* nothing */
 #define token_info_pop(token) /* nothing */
 #endif
-#if 0
-{
-#endif
 %}
 
 %pure_parser
@@ -8173,7 +8153,7 @@ gettable_gen(struct parser_params *parser, ID id)
 	return NEW_LIT(rb_enc_from_encoding(parser->enc));
     }
     else if (is_local_id(id)) {
-	if (dyna_in_block() && dvar_get_defined(id)) return NEW_DVAR(id);
+	if (dyna_in_block() && dvar_defined(id)) return NEW_DVAR(id);
 	if (local_id(id)) return NEW_LVAR(id);
 	/* method call without arguments */
 	return NEW_VCALL(id);
@@ -8287,6 +8267,10 @@ shadowing_lvar_gen(struct parser_params *parser, ID name)
 	}
 	else if (dvar_defined(name) || local_id(name)) {
 	    rb_warningS("shadowing outer local variable - %s", rb_id2name(name));
+	    vtable_add(lvtbl->vars, name);
+	    if (lvtbl->used) {
+		vtable_add(lvtbl->used, name);
+	    }
 	}
     }
     else {
@@ -8969,20 +8953,22 @@ new_args_gen(struct parser_params *parser, NODE *m, NODE *o, ID r, NODE *p, ID b
 #define LVAR_USED ((int)1 << (sizeof(int) * CHAR_BIT - 1))
 
 static void
-warn_unused_var(struct parser_params *parser, struct vtable *tbl)
+warn_unused_var(struct parser_params *parser, struct local_vars *local)
 {
     int i, cnt;
-    ID *v;
-    int *u;
+    ID *v, *u;
 
-    if (!tbl->line) return;
-    v = tbl->tbl;
-    u = tbl->line;
-    cnt = tbl->pos;
+    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;
 	if (idUScore == v[i]) continue;
-	rb_compile_warn(ruby_sourcefile, u[i], "assigned but unused variable - %s", rb_id2name(v[i]));
+	rb_compile_warn(ruby_sourcefile, (int)u[i], "assigned but unused variable - %s", rb_id2name(v[i]));
     }
 }
 
@@ -8990,12 +8976,12 @@ static void
 local_push_gen(struct parser_params *parser, int inherit_dvars)
 {
     struct local_vars *local;
-    int usage = !inherit_dvars && RTEST(ruby_verbose);
 
     local = ALLOC(struct local_vars);
     local->prev = lvtbl;
-    local->args = vtable_alloc(0, usage);
-    local->vars = vtable_alloc(inherit_dvars ? DVARS_INHERIT : DVARS_TOPSCOPE, usage);
+    local->args = vtable_alloc(0);
+    local->vars = vtable_alloc(inherit_dvars ? DVARS_INHERIT : DVARS_TOPSCOPE);
+    local->used = !inherit_dvars && RTEST(ruby_verbose) ? vtable_alloc(0) : 0;
     lvtbl = local;
 }
 
@@ -9003,9 +8989,11 @@ static void
 local_pop_gen(struct parser_params *parser)
 {
     struct local_vars *local = lvtbl->prev;
-    warn_unused_var(parser, lvtbl->args);
+    if (lvtbl->used) {
+	warn_unused_var(parser, lvtbl);
+	vtable_free(lvtbl->used);
+    }
     vtable_free(lvtbl->args);
-    warn_unused_var(parser, lvtbl->vars);
     vtable_free(lvtbl->vars);
     xfree(lvtbl);
     lvtbl = local;
@@ -9045,48 +9033,56 @@ local_tbl_gen(struct parser_params *parser)
 static int
 arg_var_gen(struct parser_params *parser, ID id)
 {
-    return vtable_add(lvtbl->args, id, ruby_sourceline);
+    vtable_add(lvtbl->args, id);
+    return vtable_size(lvtbl->args) - 1;
 }
 
 static int
 local_var_gen(struct parser_params *parser, ID id)
 {
-    return vtable_add(lvtbl->vars, id, ruby_sourceline);
+    vtable_add(lvtbl->vars, id);
+    if (lvtbl->used) {
+	vtable_add(lvtbl->used, (ID)ruby_sourceline);
+    }
+    return vtable_size(lvtbl->vars) - 1;
 }
 
 static int
 local_id_gen(struct parser_params *parser, ID id)
 {
-    struct vtable *vars, *args;
-    int i;
+    struct vtable *vars, *args, *used;
 
     vars = lvtbl->vars;
     args = lvtbl->args;
+    used = lvtbl->used;
 
     while (vars && POINTER_P(vars->prev)) {
 	vars = vars->prev;
 	args = args->prev;
+	if (used) used = used->prev;
     }
 
     if (vars && vars->prev == DVARS_INHERIT) {
 	return rb_local_defined(id);
     }
-    else if ((i = vtable_included(args, id)) != 0) {
-	if (args->line) args->line[i-1] |= LVAR_USED;
+    else if (vtable_included(args, id)) {
 	return 1;
     }
-    else if ((i = vtable_included(vars, id)) != 0) {
-	if (vars->line) vars->line[i-1] |= LVAR_USED;
-	return 1;
+    else {
+	int i = vtable_included(vars, id);
+	if (i && used) used->tbl[i-1] |= LVAR_USED;
+	return i != 0;
     }
-    return 0;
 }
 
 static const struct vtable *
 dyna_push_gen(struct parser_params *parser)
 {
-    lvtbl->args = vtable_alloc(lvtbl->args, lvtbl->args->line != 0);
-    lvtbl->vars = vtable_alloc(lvtbl->vars, lvtbl->vars->line != 0);
+    lvtbl->args = vtable_alloc(lvtbl->args);
+    lvtbl->vars = vtable_alloc(lvtbl->vars);
+    if (lvtbl->used) {
+	lvtbl->used = vtable_alloc(lvtbl->used);
+    }
     return lvtbl->args;
 }
 
@@ -9095,13 +9091,16 @@ dyna_pop_1(struct parser_params *parser)
 {
     struct vtable *tmp;
 
+    if ((tmp = lvtbl->used) != 0) {
+	warn_unused_var(parser, lvtbl);
+	lvtbl->used = lvtbl->used->prev;
+	vtable_free(tmp);
+    }
     tmp = lvtbl->args;
-    lvtbl->args = tmp->prev;
-    warn_unused_var(parser, tmp);
+    lvtbl->args = lvtbl->args->prev;
     vtable_free(tmp);
     tmp = lvtbl->vars;
-    lvtbl->vars = tmp->prev;
-    warn_unused_var(parser, tmp);
+    lvtbl->vars = lvtbl->vars->prev;
     vtable_free(tmp);
 }
 
@@ -9126,26 +9125,26 @@ dyna_in_block_gen(struct parser_params *parser)
 }
 
 static int
-dvar_defined_gen(struct parser_params *parser, ID id, int new)
+dvar_defined_gen(struct parser_params *parser, ID id)
 {
-    struct vtable *vars, *args;
-    int i, usage = 1;
+    struct vtable *vars, *args, *used;
+    int i;
 
     args = lvtbl->args;
     vars = lvtbl->vars;
+    used = lvtbl->used;
 
     while (POINTER_P(vars)) {
-	if ((i = vtable_included(args, id)) != 0) {
-	    if (usage && args->line) args->line[i-1] |= LVAR_USED;
+	if (vtable_included(args, id)) {
 	    return 1;
 	}
-	else if ((i = vtable_included(vars, id)) != 0) {
-	    if (usage && vars->line) vars->line[i-1] |= LVAR_USED;
+	if ((i = vtable_included(vars, id)) != 0) {
+	    if (used) used->tbl[i-1] |= LVAR_USED;
 	    return 1;
 	}
 	args = args->prev;
 	vars = vars->prev;
-	if (new) usage = 0;
+	if (used) used = used->prev;
     }
 
     if (vars == DVARS_INHERIT) {
diff --git a/test/ruby/test_rubyoptions.rb b/test/ruby/test_rubyoptions.rb
index 5a22fa0c9a..9fad50ae4c 100644
--- a/test/ruby/test_rubyoptions.rb
+++ b/test/ruby/test_rubyoptions.rb
@@ -454,21 +454,6 @@ class TestRubyOptions < Test::Unit::TestCase
     assert_in_out_err(["-we", "def foo\n  eval('a=1')\nend"], "", [], [], feature3446)
     assert_in_out_err(["-we", "1.times do\n  a=1\nend"], "", [], [], feature3446)
     assert_in_out_err(["-we", "def foo\n  1.times do\n    a=1\n  end\nend"], "", [], ["-e:3: warning: assigned but unused variable - a"], feature3446)
-    bug4130 = '[ruby-dev:42718]'
-    assert_in_out_err(["-we", "def foo\n""  1.times do |a| end\n""end"], "", [],
-                      ["-e:2: warning: assigned but unused variable - a"], bug4130)
-  end
-
-  def test_shadowing_variable
-    bug4130 = '[ruby-dev:42718]'
-    assert_in_out_err(["-we", "def foo\n""  a=1\n""  1.times do |a| a; end\n""  a\n""end"],
-                      "", [], ["-e:3: warning: shadowing outer local variable - a"], bug4130)
-    assert_in_out_err(["-we", "def foo\n""  a = 1\n""  1.times do |a|\n""  end\n""end"],
-                      "", [],
-                      ["-e:3: warning: shadowing outer local variable - a",
-                       "-e:3: warning: assigned but unused variable - a",
-                       "-e:2: warning: assigned but unused variable - a",
-                      ], bug4130)
   end
 
   def test_script_from_stdin
diff --git a/version.h b/version.h
index 5672fd21e9..ebaf916baa 100644
--- a/version.h
+++ b/version.h
@@ -1,11 +1,11 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_RELEASE_DATE "2010-12-08"
+#define RUBY_RELEASE_DATE "2010-12-07"
 #define RUBY_PATCHLEVEL -1
 #define RUBY_BRANCH_NAME "trunk"
 
 #define RUBY_RELEASE_YEAR 2010
 #define RUBY_RELEASE_MONTH 12
-#define RUBY_RELEASE_DAY 8
+#define RUBY_RELEASE_DAY 7
 
 #include "ruby/version.h"