kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* object.c (rb_to_float): replaced by to_flo definition from

Browse source 
math.c  [ruby-dev:37668]

* math.c (Need_Float): use rb_to_float().

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21214 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2008-12-31 14:30:50 +00:00
parent a6d38b8c39
commit 98454a6da8
3 changed files with 15 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -24,6 +24,13 @@ Wed Dec 31 14:52:33 2008 Tanaka Akira <akr@fsij.org>
* ext/openssl/ossl_pkey_ec.c (ossl_ec_key_initialize): ditto. * ext/openssl/ossl_pkey_ec.c (ossl_ec_key_initialize): ditto.
(ossl_ec_group_initialize): ditto. (ossl_ec_group_initialize): ditto.
Wed Dec 31 14:12:35 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* object.c (rb_to_float): replaced by to_flo definition from
math.c [ruby-dev:37668]
* math.c (Need_Float): use rb_to_float().
Wed Dec 31 13:49:06 2008 Tanaka Akira <akr@fsij.org> Wed Dec 31 13:49:06 2008 Tanaka Akira <akr@fsij.org>
* ext/openssl/lib/openssl/buffering.rb (Buffering#read_nonblock): * ext/openssl/lib/openssl/buffering.rb (Buffering#read_nonblock):

15
math.c
View file

@ -15,20 +15,7 @@
VALUE rb_mMath; VALUE rb_mMath;
static VALUE #define Need_Float(x) (x) = rb_to_float(x)
to_flo(VALUE x)
{
if (!rb_obj_is_kind_of(x, rb_cNumeric)) {
rb_raise(rb_eTypeError, "can't convert %s into Float",
NIL_P(x) ? "nil" :
x == Qtrue ? "true" :
x == Qfalse ? "false" :
rb_obj_classname(x));
}
return rb_convert_type(x, T_FLOAT, "Float", "to_f");
}
#define Need_Float(x) (x) = to_flo(x)
#define Need_Float2(x,y) do {\ #define Need_Float2(x,y) do {\
Need_Float(x);\ Need_Float(x);\
Need_Float(y);\ Need_Float(y);\

18
object.c
View file

@ -2270,19 +2270,15 @@ rb_f_float(VALUE obj, VALUE arg)
VALUE VALUE
rb_to_float(VALUE val) rb_to_float(VALUE val)
{ {
VALUE v;
if (TYPE(val) == T_FLOAT) return val; if (TYPE(val) == T_FLOAT) return val;
if (NIL_P(val)) { if (!rb_obj_is_kind_of(val, rb_cNumeric)) {
rb_raise(rb_eTypeError, "can't convert nil into Float"); rb_raise(rb_eTypeError, "can't convert %s into Float",
NIL_P(val) ? "nil" :
val == Qtrue ? "true" :
val == Qfalse ? "false" :
rb_obj_classname(val));
} }
v = convert_type(val, "Float", "to_f", Qtrue); return rb_convert_type(val, T_FLOAT, "Float", "to_f");
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;
} }
double double