yugui	2011-08-11 09:39:09 +0900 (Thu, 11 Aug 2011)

  New Revision: 32925

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=32925

  Log:
    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.

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/class.c
    branches/ruby_1_9_2/variable.c
    branches/ruby_1_9_2/version.h

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 32924)
+++ ruby_1_9_2/ChangeLog	(revision 32925)
@@ -1,3 +1,11 @@
+Fri Jul  1 03:28:25 2011  Yukihiro Matsumoto  <matz@r...>
+
+	* 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@a...>
 
 	* vm_insnhelper.c (vm_call_bmethod): fix to hook call/return event
Index: ruby_1_9_2/variable.c
===================================================================
--- ruby_1_9_2/variable.c	(revision 32924)
+++ ruby_1_9_2/variable.c	(revision 32925)
@@ -1779,7 +1779,7 @@
 		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) {
Index: ruby_1_9_2/class.c
===================================================================
--- ruby_1_9_2/class.c	(revision 32924)
+++ ruby_1_9_2/class.c	(revision 32925)
@@ -347,6 +347,7 @@
     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
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 32924)
+++ ruby_1_9_2/version.h	(revision 32925)
@@ -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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/