matz	2007-11-21 01:18:05 +0900 (Wed, 21 Nov 2007)

  New Revision: 13989

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/object.c
    branches/ruby_1_8/version.h

  Log:
    * object.c (nil_plus): remove unused function.  [ruby-core:13737]

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ChangeLog?r1=13989&r2=13988
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/version.h?r1=13989&r2=13988
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/object.c?r1=13989&r2=13988

Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 13988)
+++ ruby_1_8/ChangeLog	(revision 13989)
@@ -1,3 +1,7 @@
+Wed Nov 21 01:04:12 2007  Yukihiro Matsumoto  <matz@r...>
+
+	* object.c (nil_plus): remove unused function.  [ruby-core:13737]
+
 Sun Nov 18 14:03:44 2007  Nobuyoshi Nakada  <nobu@r...>
 
 	* eval.c (rb_alias): do not call hook functions until initialization
Index: ruby_1_8/version.h
===================================================================
--- ruby_1_8/version.h	(revision 13988)
+++ ruby_1_8/version.h	(revision 13989)
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.8.6"
-#define RUBY_RELEASE_DATE "2007-11-18"
+#define RUBY_RELEASE_DATE "2007-11-21"
 #define RUBY_VERSION_CODE 186
-#define RUBY_RELEASE_CODE 20071118
+#define RUBY_RELEASE_CODE 20071121
 #define RUBY_PATCHLEVEL 5000
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 6
 #define RUBY_RELEASE_YEAR 2007
 #define RUBY_RELEASE_MONTH 11
-#define RUBY_RELEASE_DAY 18
+#define RUBY_RELEASE_DAY 21
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];
Index: ruby_1_8/object.c
===================================================================
--- ruby_1_8/object.c	(revision 13988)
+++ ruby_1_8/object.c	(revision 13989)
@@ -839,29 +839,7 @@
     return rb_str_new2("nil");
 }
 
-#ifdef NIL_PLUS
 static VALUE
-nil_plus(x, y)
-    VALUE x, y;
-{
-    switch (TYPE(y)) {
-      case T_NIL:
-      case T_FIXNUM:
-      case T_FLOAT:
-      case T_BIGNUM:
-      case T_STRING:
-      case T_ARRAY:
-	return y;
-      default:
-	rb_raise(rb_eTypeError, "tried to add %s(%s) to nil",
-		 RSTRING(rb_inspect(y))->ptr,
-		 rb_obj_classname(y));
-    }
-    /* not reached */
-}
-#endif
-
-static VALUE
 main_to_s(obj)
     VALUE obj;
 {

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