From 0cdd4e004f50064b1507d7313665860bc9aaeb2d Mon Sep 17 00:00:00 2001 From: shyouhei Date: Mon, 14 Dec 2009 03:53:19 +0000 Subject: merge revision(s) 26032: * 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_7@26092 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ object.c | 9 ++------- version.h | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index edeb9132f2..862452ab73 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Dec 14 12:40:10 2009 Marc-Andre Lafortune + + * object.c (rb_Float): Allow results of to_f to be NaN + [ruby-core:26733] + Mon Dec 14 12:35:21 2009 Nobuyoshi Nakada * eval.c (proc_invoke): unbound block created by define_method diff --git a/object.c b/object.c index 75153b843a..ab62cbf05c 100644 --- a/object.c +++ b/object.c @@ -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"); + } } diff --git a/version.h b/version.h index cf3fe7accd..dc39977ad1 100644 --- a/version.h +++ b/version.h @@ -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 -- cgit v1.2.3