From 71d60a2e1063c9a476b82497d928eb06d0729e83 Mon Sep 17 00:00:00 2001 From: matz Date: Wed, 31 Dec 2008 14:30:50 +0000 Subject: * object.c (rb_to_float): replaced by to_flo definition from math.c [ruby-dev:37668] * math.c (Need_Float): use rb_to_float(). git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@21214 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- object.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) (limited to 'object.c') diff --git a/object.c b/object.c index 61aa80a01..aacf7ce43 100644 --- a/object.c +++ b/object.c @@ -2270,19 +2270,15 @@ rb_f_float(VALUE obj, VALUE arg) VALUE rb_to_float(VALUE val) { - VALUE v; - if (TYPE(val) == T_FLOAT) return val; - if (NIL_P(val)) { - rb_raise(rb_eTypeError, "can't convert nil into Float"); - } - v = convert_type(val, "Float", "to_f", Qtrue); - if (TYPE(v) != T_FLOAT) { - const char *cname = rb_obj_classname(val); - rb_raise(rb_eTypeError, "can't convert %s to Float (%s#to_f gives %s)", - cname, cname, rb_obj_classname(v)); - } - return v; + if (!rb_obj_is_kind_of(val, rb_cNumeric)) { + rb_raise(rb_eTypeError, "can't convert %s into Float", + NIL_P(val) ? "nil" : + val == Qtrue ? "true" : + val == Qfalse ? "false" : + rb_obj_classname(val)); + } + return rb_convert_type(val, T_FLOAT, "Float", "to_f"); } double -- cgit