Permalink
Browse files

merge revision(s) 26032:

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


git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8_7@26092 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information...
1 parent b1f6853 commit 97c4b95125af471c6b826c096b86ae1ea9fbd733 @shyouhei shyouhei committed Dec 14, 2009
Showing with 8 additions and 8 deletions.
  1. +5 −0 ChangeLog
  2. +2 −7 object.c
  3. +1 −1 version.h
View
@@ -1,3 +1,8 @@
+Mon Dec 14 12:40:10 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
+
+ * 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@ruby-lang.org>
* eval.c (proc_invoke): unbound block created by define_method
View
@@ -2470,13 +2470,8 @@ rb_Float(val)
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");
+
}
}
View
@@ -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

0 comments on commit 97c4b95

Please sign in to comment.