From 2c0b73f16a997b6b957e435d808a0b60e6afd9d3 Mon Sep 17 00:00:00 2001 From: wyhaines Date: Tue, 22 Jun 2010 17:18:04 +0000 Subject: object.c: Backport #2364 [ruby-core:26733]; Allow result of to_f to be NaN to permit conversion from BigDecimal('NaN') to Float. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@28392 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 8 ++++++-- object.c | 6 +----- version.h | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 368b9f7283..fb40b909eb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,11 @@ +Wed Jun 23 02:07:00 Kirk Haines + + * object.c: Backport #2364 [ruby-core:26733]; Allow result of to_f to be NaN to permit conversion from BigDecimal('NaN') to Float. + Tue Jun 22 04:29:00 Kirk Haines - * eval.c: Bug #1886 [ruby-core:24767]; ensure that rb_exc_raise and rb_exc_fatal require an exception object. Backport of r24403. - * test/ruby/test_exception.rb: test for exception change. Backport of r24404. + * eval.c: Bug #1886 [ruby-core:24767]; ensure that rb_exc_raise and rb_exc_fatal require an exception object. Backport of r24403. r28374 + * test/ruby/test_exception.rb: test for exception change. Backport of r24404. r28374 Sat Jun 12 07:34:00 Kirk Haines diff --git a/object.c b/object.c index 60df9b3386..b321eb7ef0 100644 --- a/object.c +++ b/object.c @@ -2386,11 +2386,7 @@ rb_Float(val) 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"); } } } diff --git a/version.h b/version.h index aab6e39df6..fe7cf96401 100644 --- a/version.h +++ b/version.h @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2010-06-23" #define RUBY_VERSION_CODE 186 #define RUBY_RELEASE_CODE 20100623 -#define RUBY_PATCHLEVEL 416 +#define RUBY_PATCHLEVEL 417 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 -- cgit v1.2.3