archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

* numeric.c (coerce_failed): fixed merge miss of r49443.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@49450 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2015-01-30 09:09:05 +00:00
parent 744408df49
commit b1b04e8179
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
numeric.c
View file

@ -235,9 +235,14 @@ NORETURN(static void coerce_failed(VALUE x, VALUE y));
static void
coerce_failed(VALUE x, VALUE y)
{
if (SPECIAL_CONST_P(y) || BUILTIN_TYPE(y) == T_FLOAT) {
y = rb_inspect(y);
}
else {
y = rb_obj_class(y);
}
rb_raise(rb_eTypeError, "%"PRIsVALUE" can't be coerced into %"PRIsVALUE,
(rb_special_const_p(y)? rb_inspect(y) : rb_obj_class(y)),
rb_obj_class(x));
y, rb_obj_class(x));
}
static VALUE

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.0.0"
#define RUBY_RELEASE_DATE "2015-01-30"
#define RUBY_PATCHLEVEL 629
#define RUBY_PATCHLEVEL 630
#define RUBY_RELEASE_YEAR 2015
#define RUBY_RELEASE_MONTH 1