summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarcandre <marcandre@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-12-06 22:05:35 +0000
committermarcandre <marcandre@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-12-06 22:05:35 +0000
commit09a2dd632b9a3f4233466d054388359684667cdc (patch)
treef6d8bfe1b869e67d9acd4cef1262782c7a93d4c7
parent899a1f4022302964b6e61cff7ba8b7ccd3a42743 (diff)
* object.c (rb_Float): Allow results of to_f to be NaN [ruby-core:26733]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@26032 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--object.c9
2 files changed, 7 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 5a8ea2c7bf..110500663a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Dec 7 07:01:19 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 7 06:43:20 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
* array.c (rb_ary_sample): Fix infinite loop bug [ruby-core:27075]
diff --git a/object.c b/object.c
index 4704ebfc30..ace7f7a21d 100644
--- a/object.c
+++ b/object.c
@@ -2486,13 +2486,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");
+
}
}