From 01d1a35a77f6dc2e522d27379d5a52b8e8a1e9eb Mon Sep 17 00:00:00 2001 From: yugui Date: Thu, 11 Aug 2011 00:39:09 +0000 Subject: merges r32342 from trunk into ruby_1_9_2. -- * class.c (Init_class_hierarchy): should name BasicObject explicitly. * variable.c (rb_const_defined_0): should not check for superclasses as const_get. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@32925 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 8 ++++++++ class.c | 1 + variable.c | 2 +- version.h | 2 +- 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index c359449cf4..0187c3225b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Fri Jul 1 03:28:25 2011 Yukihiro Matsumoto + + * 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 * vm_insnhelper.c (vm_call_bmethod): fix to hook call/return event diff --git a/class.c b/class.c index 8d759739c3..3711950f0a 100644 --- a/class.c +++ b/class.c @@ -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) { diff --git a/version.h b/version.h index 5ad0e1719d..d098eb76da 100644 --- a/version.h +++ b/version.h @@ -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 -- cgit v1.2.3