summaryrefslogtreecommitdiff
path: root/numeric.c
diff options
context:
space:
mode:
authormrkn <mrkn@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-03-18 14:52:46 +0000
committermrkn <mrkn@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-03-18 14:52:46 +0000
commitb60a7b43feaed02089c158faf0bf647327ed61f0 (patch)
tree2a8ada9bacf0c11edb940a2729e708f8b6fa624b /numeric.c
parent2897eb11a0d20d198a8d3f69a16c33369147749f (diff)
* numeric.c (int_to_f, fix_to_f): rename fix_to_f to int_to_f, and add
treatment for subclasses which don't have definitions of to_f method. * numeric.c (Integer#to_f, Fixnum#to_f): move to_f method from Fixnum to Integer. * ext/-test-/integer/my_integer.rb: define helper class for testing to_f method for a subclass of Integer. * ext/-test-/integer/extconf.rb: ditto. * ext/-test-/integer/init.c: ditto. * test/-ext-/integer/test_my_integer.rb: examine to_f method for a subclass of Integer. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54179 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'numeric.c')
-rw-r--r--numeric.c15
1 files changed, 10 insertions, 5 deletions
diff --git a/numeric.c b/numeric.c
index fc2a5142019..e0871049f72 100644
--- a/numeric.c
+++ b/numeric.c
@@ -3765,18 +3765,23 @@ fix_aref(VALUE fix, VALUE idx)
/*
* call-seq:
- * fix.to_f -> float
+ * int.to_f -> float
*
- * Converts +fix+ to a Float.
+ * Converts +int+ to a Float.
*
*/
static VALUE
-fix_to_f(VALUE num)
+int_to_f(VALUE num)
{
double val;
- val = (double)FIX2LONG(num);
+ if (FIXNUM_P(num)) {
+ val = (double)FIX2LONG(num);
+ }
+ else {
+ rb_raise(rb_eTypeError, "Unknown subclass for to_f: %s", rb_obj_classname(num));
+ }
return DBL2NUM(val);
}
@@ -4214,6 +4219,7 @@ Init_Numeric(void)
rb_define_method(rb_cInteger, "ord", int_ord, 0);
rb_define_method(rb_cInteger, "to_i", int_to_i, 0);
rb_define_method(rb_cInteger, "to_int", int_to_i, 0);
+ rb_define_method(rb_cInteger, "to_f", int_to_f, 0);
rb_define_method(rb_cInteger, "floor", int_to_i, 0);
rb_define_method(rb_cInteger, "ceil", int_to_i, 0);
rb_define_method(rb_cInteger, "truncate", int_to_i, 0);
@@ -4253,7 +4259,6 @@ Init_Numeric(void)
rb_define_method(rb_cFixnum, "<<", rb_fix_lshift, 1);
rb_define_method(rb_cFixnum, ">>", rb_fix_rshift, 1);
- rb_define_method(rb_cFixnum, "to_f", fix_to_f, 0);
rb_define_method(rb_cFixnum, "size", fix_size, 0);
rb_define_method(rb_cFixnum, "bit_length", rb_fix_bit_length, 0);
rb_define_method(rb_cFixnum, "succ", fix_succ, 0);