shyouhei	2009-12-14 12:53:19 +0900 (Mon, 14 Dec 2009)

  New Revision: 26092

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

  Log:
    merge revision(s) 26032:
    * object.c (rb_Float): Allow results of to_f to be NaN
      [ruby-core:26733]

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

Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 26091)
+++ ruby_1_8_7/ChangeLog	(revision 26092)
@@ -1,3 +1,8 @@
+Mon Dec 14 12:40:10 2009  Marc-Andre Lafortune  <ruby-core@m...>
+
+	* object.c (rb_Float): Allow results of to_f to be NaN
+	  [ruby-core:26733]
+
 Mon Dec 14 12:35:21 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* eval.c (proc_invoke): unbound block created by define_method
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 26091)
+++ ruby_1_8_7/version.h	(revision 26092)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2009-12-14"
 #define RUBY_VERSION_CODE 187
 #define RUBY_RELEASE_CODE 20091214
-#define RUBY_PATCHLEVEL 235
+#define RUBY_PATCHLEVEL 236
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
Index: ruby_1_8_7/object.c
===================================================================
--- ruby_1_8_7/object.c	(revision 26091)
+++ ruby_1_8_7/object.c	(revision 26092)
@@ -2470,13 +2470,8 @@
 	break;
 
       default:
-      {
-	  VALUE f = rb_convert_type(val, T_FLOAT, "Float", "to_f");
-	  if (isnan(RFLOAT(f)->value)) {
-	      rb_raise(rb_eArgError, "invalid value for Float()");
-	  }
-	  return f;
-      }
+	return rb_convert_type(val, T_FLOAT, "Float", "to_f");
+
     }
 }
 

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