diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | class.c | 1 | ||||
| -rw-r--r-- | variable.c | 2 | ||||
| -rw-r--r-- | version.h | 2 |
4 files changed, 11 insertions, 2 deletions
@@ -1,3 +1,11 @@ +Fri Jul 1 03:28:25 2011 Yukihiro Matsumoto <matz@ruby-lang.org> + + * class.c (Init_class_hierarchy): should name BasicObject + explicitly. + + * variable.c (rb_const_defined_0): should not check for + superclasses as const_get. + Thu Jun 30 22:17:04 2011 Koichi Sasada <ko1@atdot.net> * vm_insnhelper.c (vm_call_bmethod): fix to hook call/return event @@ -347,6 +347,7 @@ Init_class_hierarchy(void) rb_cModule = boot_defclass("Module", rb_cObject); rb_cClass = boot_defclass("Class", rb_cModule); + rb_const_set(rb_cObject, rb_intern("BasicObject"), rb_cBasicObject); RBASIC(rb_cClass)->klass = RBASIC(rb_cModule)->klass = RBASIC(rb_cObject)->klass diff --git a/variable.c b/variable.c index 57e37fb779..71ef831b4e 100644 --- a/variable.c +++ b/variable.c @@ -1779,7 +1779,7 @@ rb_const_defined_0(VALUE klass, ID id, int exclude, int recurse) return (int)Qfalse; return (int)Qtrue; } - if (!recurse && klass != rb_cObject) break; + if (!recurse) break; tmp = RCLASS_SUPER(tmp); } if (!exclude && !mod_retry && BUILTIN_TYPE(klass) == T_MODULE) { @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.2" -#define RUBY_PATCHLEVEL 310 +#define RUBY_PATCHLEVEL 311 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 |