shyouhei	2008-06-08 04:21:12 +0900 (Sun, 08 Jun 2008)

  New Revision: 16955

  Modified files:
    branches/ruby_1_8_6/object.c
    branches/ruby_1_8_6/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_6/version.h?r1=16955&r2=16954&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/object.c?r1=16955&r2=16954&diff_format=u

Index: ruby_1_8_6/version.h
===================================================================
--- ruby_1_8_6/version.h	(revision 16954)
+++ ruby_1_8_6/version.h	(revision 16955)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2008-06-08"
 #define RUBY_VERSION_CODE 186
 #define RUBY_RELEASE_CODE 20080608
-#define RUBY_PATCHLEVEL 149
+#define RUBY_PATCHLEVEL 150
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
Index: ruby_1_8_6/object.c
===================================================================
--- ruby_1_8_6/object.c	(revision 16954)
+++ ruby_1_8_6/object.c	(revision 16955)
@@ -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/