diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | variable.c | 14 |
2 files changed, 16 insertions, 7 deletions
@@ -1,3 +1,12 @@ +Thu Oct 2 01:02:35 2003 Yukihiro Matsumoto <matz@ruby-lang.org> + + * variable.c (rb_const_defined_at): should exclude constants from + Object when TYPE(klass) == T_MODULE *and* exclude is on. + [ruby-dev:21458] + + * variable.c (rb_const_get_0): do not lookup constants from Object + when TYPE(klass) == T_MODULE *and* exclude is on. + Thu Oct 2 00:21:11 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org> * test/logger/test_logger.rb: unlinking file before close causes diff --git a/variable.c b/variable.c index f2e9c7c98e..05f6281c3d 100644 --- a/variable.c +++ b/variable.c @@ -1286,7 +1286,7 @@ rb_const_get_0(klass, id, exclude, recurse) if (!recurse && klass != rb_cObject) break; tmp = RCLASS(tmp)->super; } - if (!mod_retry && BUILTIN_TYPE(klass) == T_MODULE) { + if (!exclude && !mod_retry && BUILTIN_TYPE(klass) == T_MODULE) { mod_retry = 1; tmp = rb_cObject; goto retry; @@ -1316,7 +1316,7 @@ rb_const_get_at(klass, id) VALUE klass; ID id; { - return rb_const_get_0(klass, id, Qfalse, Qfalse); + return rb_const_get_0(klass, id, Qtrue, Qfalse); } VALUE @@ -1451,15 +1451,15 @@ rb_const_defined_0(klass, id, exclude, recurse) } int -rb_const_defined_at(klass, id) +rb_const_defined_from(klass, id) VALUE klass; ID id; { - return rb_const_defined_0(klass, id, Qtrue, Qfalse); + return rb_const_defined_0(klass, id, Qtrue, Qtrue); } int -rb_const_defined_from(klass, id) +rb_const_defined(klass, id) VALUE klass; ID id; { @@ -1467,11 +1467,11 @@ rb_const_defined_from(klass, id) } int -rb_const_defined(klass, id) +rb_const_defined_at(klass, id) VALUE klass; ID id; { - return rb_const_defined_0(klass, id, Qtrue, Qtrue); + return rb_const_defined_0(klass, id, Qtrue, Qfalse); } static void |