shyouhei	2008-06-08 04:20:14 +0900 (Sun, 08 Jun 2008)

  New Revision: 16953

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

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


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/object.c?r1=16953&r2=16952&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/version.h?r1=16953&r2=16952&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/ChangeLog?r1=16953&r2=16952&diff_format=u

Index: ruby_1_8_5/ChangeLog
===================================================================
--- ruby_1_8_5/ChangeLog	(revision 16952)
+++ ruby_1_8_5/ChangeLog	(revision 16953)
@@ -1,3 +1,7 @@
+Sun Jun  8 04:18:50 2008  Yukihiro Matsumoto  <matz@r...>
+
+	* object.c (nil_plus): remove unused function.  [ruby-core:13737]
+
 Sun Jun  8 04:15:40 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* eval.c (rb_alias): do not call hook functions until initialization
Index: ruby_1_8_5/version.h
===================================================================
--- ruby_1_8_5/version.h	(revision 16952)
+++ ruby_1_8_5/version.h	(revision 16953)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2008-06-08"
 #define RUBY_VERSION_CODE 185
 #define RUBY_RELEASE_CODE 20080608
-#define RUBY_PATCHLEVEL 150
+#define RUBY_PATCHLEVEL 151
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
Index: ruby_1_8_5/object.c
===================================================================
--- ruby_1_8_5/object.c	(revision 16952)
+++ ruby_1_8_5/object.c	(revision 16953)
@@ -812,29 +812,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/