diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-10-22 03:05:10 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-10-22 03:05:10 +0000 |
commit | 1419b789ab827452d1c91c552ec0c121b93b9b0e (patch) | |
tree | b893dc4ea2e2be5d4deb4d73cf71e36751706b1e /eval.c | |
parent | e7a1207dcddfd839b1162de4553f8e33ee56b325 (diff) | |
download | ruby-1419b789ab827452d1c91c552ec0c121b93b9b0e.tar.gz |
* eval.c (rb_alias): was warning for wrong condition.
[ruby-dev:24565]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7101 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'eval.c')
-rw-r--r-- | eval.c | 10 |
1 files changed, 6 insertions, 4 deletions
@@ -1996,7 +1996,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); @@ -2016,9 +2016,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 */ @@ -2028,6 +2025,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) { |