diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-08-23 06:02:15 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-08-23 06:02:15 +0000 |
commit | 1289a7a11fe55a4e37d923fc6b0af2c228e83175 (patch) | |
tree | fe8a90542f77c78ecdaef684d155c6ea66a7dcef /variable.c | |
parent | e15efe7733f5e6e9377ae1bd2fc5f6029c919f1d (diff) |
* eval.c (is_defined): should not dump core for "defined?(())".
* eval.c (umethod_bind): recv can be an instance of descender of
oklass if oklass is a Module.
* hash.c (rb_hash_equal): check identiry equality first.
* file.c (group_member): should check real gid only.
* file.c (eaccess): do not cache euid, since effective euid may be
changed via Process.euid=().
* file.c (eaccess): return -1 unless every specified access mode
is permitted.
* eval.c (rb_eval): while/until returns the value which is given
to break.
* parse.y (value_expr): using while/until/class/def as an
expression is now gives a warning, not an error.
* range.c (range_eqq): should compare strings based on magical
increment (using String#upto), not dictionary order.
* enum.c (enum_sort_by): new method for Schewartzian transformed
stable sort.
* variable.c (mod_av_set): detect constant overriding for built-in
classes/modules.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1707 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'variable.c')
-rw-r--r-- | variable.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/variable.c b/variable.c index eab951d102..28013e76a8 100644 --- a/variable.c +++ b/variable.c @@ -1282,8 +1282,11 @@ mod_av_set(klass, id, val, isconst) if (!RCLASS(klass)->iv_tbl) { RCLASS(klass)->iv_tbl = st_init_numtable(); } - else if (isconst && st_lookup(RCLASS(klass)->iv_tbl, id, 0)) { - rb_warn("already initialized %s %s", dest, rb_id2name(id)); + else if (isconst) { + if (st_lookup(RCLASS(klass)->iv_tbl, id, 0) || + (klass == rb_cObject && st_lookup(rb_class_tbl, id, 0))) { + rb_warn("already initialized %s %s", dest, rb_id2name(id)); + } } st_insert(RCLASS(klass)->iv_tbl, id, val); |