shyouhei	2009-09-11 12:23:37 +0900 (Fri, 11 Sep 2009)

  New Revision: 24843

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

  Log:
    merge revision(s) 22679:
    * class.c (rb_singleton_class_clone): Qnil must be used for a null
      class reference when we use NIL_P() to check class reference
      validity.  The bug was exposed by the spec test of Sequel.
    * eval.c (ruby_init): Use NEW_CREF().

  Modified files:
    branches/ruby_1_8_7/ChangeLog
    branches/ruby_1_8_7/class.c
    branches/ruby_1_8_7/eval.c
    branches/ruby_1_8_7/version.h

Index: ruby_1_8_7/class.c
===================================================================
--- ruby_1_8_7/class.c	(revision 24842)
+++ ruby_1_8_7/class.c	(revision 24843)
@@ -153,7 +153,7 @@
 		data.klass = obj;
 		break;
 	      default:
-		data.klass = 0;
+		data.klass = Qnil;
 		break;
 	    }
 
Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 24842)
+++ ruby_1_8_7/ChangeLog	(revision 24843)
@@ -1,3 +1,11 @@
+Fri Sep 11 11:56:53 2009  Akinori MUSHA  <knu@i...>
+
+	* class.c (rb_singleton_class_clone): Qnil must be used for a null
+	  class reference when we use NIL_P() to check class reference
+	  validity.  The bug was exposed by the spec test of Sequel.
+
+	* eval.c (ruby_init): Use NEW_CREF().
+
 Thu Sep 10 10:53:03 2009  NAKAMURA Usaku  <usa@r...>
 
 	* io.c (rb_sysopen): workaround for MSVCRT's bug.
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 24842)
+++ ruby_1_8_7/version.h	(revision 24843)
@@ -1,15 +1,15 @@
 #define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2009-09-10"
+#define RUBY_RELEASE_DATE "2009-09-11"
 #define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20090910
-#define RUBY_PATCHLEVEL 201
+#define RUBY_RELEASE_CODE 20090911
+#define RUBY_PATCHLEVEL 202
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
 #define RUBY_VERSION_TEENY 7
 #define RUBY_RELEASE_YEAR 2009
 #define RUBY_RELEASE_MONTH 9
-#define RUBY_RELEASE_DAY 10
+#define RUBY_RELEASE_DAY 11
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];
Index: ruby_1_8_7/eval.c
===================================================================
--- ruby_1_8_7/eval.c	(revision 24842)
+++ ruby_1_8_7/eval.c	(revision 24843)
@@ -1410,7 +1410,7 @@
 	rb_call_inits();
 	ruby_class = rb_cObject;
 	ruby_frame->self = ruby_top_self;
-	ruby_top_cref = rb_node_newnode(NODE_CREF,rb_cObject,0,0);
+	ruby_top_cref = NEW_CREF(rb_cObject, 0);
 	ruby_cref = ruby_top_cref;
 	rb_define_global_const("TOPLEVEL_BINDING", rb_f_binding(ruby_top_self));
 #ifdef __MACOS__

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