From b1b04e8179c9ed0fdca5b094efac01c6a31a76db Mon Sep 17 00:00:00 2001
From: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 30 Jan 2015 09:09:05 +0000
Subject: [PATCH] * numeric.c (coerce_failed): fixed merge miss of r49443.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@49450 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 numeric.c | 9 +++++++--
 version.h | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/numeric.c b/numeric.c
index 3d54a0b688..95d8bc952e 100644
--- a/numeric.c
+++ b/numeric.c
@@ -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
diff --git a/version.h b/version.h
index 3e8884577c..cfa84bda74 100644
--- a/version.h
+++ b/version.h
@@ -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