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
This commit is contained in:
shyouhei 2009-12-14 03:53:19 +00:00
parent fd13ad8cdc
commit 0cdd4e004f
3 changed files with 8 additions and 8 deletions

View file

@ -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 file

@ -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 file

@ -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