From dc9f73015c9ebc1a25f4f1465622715803ba2d6f Mon Sep 17 00:00:00 2001 From: matz Date: Fri, 22 Oct 2004 03:05:10 +0000 Subject: * eval.c (rb_alias): was warning for wrong condition. [ruby-dev:24565] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@7101 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ eval.c | 10 ++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 22a5f2c8a..c94da5d10 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Oct 22 12:02:28 2004 Yukihiro Matsumoto + + * eval.c (rb_alias): was warning for wrong condition. + [ruby-dev:24565] + Fri Oct 22 10:36:37 2004 GOTOU Yuuzou * lib/webrick/httprequest.rb (WEBrick::HTTPRequest#meta_vars): diff --git a/eval.c b/eval.c index 7a1d6a891..7df2799ca 100644 --- a/eval.c +++ b/eval.c @@ -1989,7 +1989,7 @@ rb_alias(klass, name, def) ID name, def; { VALUE origin; - NODE *orig, *body; + NODE *orig, *body, *node; VALUE singleton = 0; rb_frozen_class_p(klass); @@ -2009,9 +2009,6 @@ rb_alias(klass, name, def) if (FL_TEST(klass, FL_SINGLETON)) { singleton = rb_iv_get(klass, "__attached__"); } - if (RTEST(ruby_verbose) && klass == origin && orig->nd_cnt == 0 && orig->nd_body) { - rb_warning("discarding old %s", rb_id2name(name)); - } body = orig->nd_body; orig->nd_cnt++; if (nd_type(body) == NODE_FBODY) { /* was alias */ @@ -2021,6 +2018,11 @@ rb_alias(klass, name, def) } rb_clear_cache_by_id(name); + if (RTEST(ruby_verbose) && st_lookup(RCLASS(klass)->m_tbl, name, (st_data_t *)&node)) { + if (node->nd_cnt == 0 && node->nd_body) { + rb_warning("discarding old %s", rb_id2name(name)); + } + } st_insert(RCLASS(klass)->m_tbl, name, (st_data_t)NEW_METHOD(NEW_FBODY(body, def, origin), orig->nd_noex)); if (singleton) { -- cgit