diff options
Diffstat (limited to 'variable.c')
| -rw-r--r-- | variable.c | 46 |
1 files changed, 44 insertions, 2 deletions
diff --git a/variable.c b/variable.c index f0ace3afb1..5c65c0425b 100644 --- a/variable.c +++ b/variable.c @@ -1284,10 +1284,11 @@ rb_const_get_at(klass, id) return Qnil; /* not reached */ } -VALUE -rb_const_get(klass, id) +static VALUE +rb_const_get_0(klass, id, exclude) VALUE klass; ID id; + int exclude; { VALUE value, tmp; int mod_retry = 0; @@ -1295,6 +1296,10 @@ rb_const_get(klass, id) tmp = klass; retry: while (tmp) { + if (exclude && tmp == rb_cObject && klass != rb_cObject) { + rb_warn("toplevel constant %s referenced by %s::%s", + rb_id2name(id), rb_class2name(klass), rb_id2name(id)); + } while (RCLASS(tmp)->iv_tbl && st_lookup(RCLASS(tmp)->iv_tbl,id,&value)) { if (value == Qundef) { rb_autoload_load(tmp, id); @@ -1316,6 +1321,22 @@ rb_const_get(klass, id) } VALUE +rb_const_get_from(klass, id) + VALUE klass; + ID id; +{ + return rb_const_get_0(klass, id, Qtrue); +} + +VALUE +rb_const_get(klass, id) + VALUE klass; + ID id; +{ + return rb_const_get_0(klass, id, Qfalse); +} + +VALUE rb_mod_remove_const(mod, name) VALUE mod, name; { @@ -1440,6 +1461,27 @@ rb_const_defined_at(klass, id) } int +rb_const_defined_from(klass, id) + VALUE klass; + ID id; +{ + VALUE tmp = klass, value; + + while (tmp) { + if (tmp == rb_cObject && klass != rb_cObject) { + break; + } + if (RCLASS(tmp)->iv_tbl && st_lookup(RCLASS(tmp)->iv_tbl, id, &value)) { + if (value == Qundef && NIL_P(autoload_file(klass, id))) + return Qfalse; + return Qtrue; + } + tmp = RCLASS(tmp)->super; + } + return Qfalse; +} + +int rb_const_defined(klass, id) VALUE klass; ID id; |