summaryrefslogtreecommitdiff
path: root/numeric.c
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-04-30 04:20:56 (GMT)
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-04-30 04:20:56 (GMT)
commit27f9556de9593483f713f622054e8fd648737438 (patch)
tree0ee73b378bf23083ab80b5b2a81483dd7598e879 /numeric.c
parent8a2df1ce3f143b49d43b3899692c6ed559b6d53c (diff)
{Fixnum,Bignum}#fdiv is unified into Integer.
* numeric.c (int_fdiv): {Fixnum,Bignum}#fdiv is unified into Integer. * bignum.c (rb_big_fdiv): Don't define Bignum#fdiv. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54832 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'numeric.c')
-rw-r--r--numeric.c21
1 files changed, 18 insertions, 3 deletions
diff --git a/numeric.c b/numeric.c
index 0ef31b7..b6ab927 100644
--- a/numeric.c
+++ b/numeric.c
@@ -3373,15 +3373,18 @@ rb_int_mul(VALUE x, VALUE y)
}
/*
- * Document-method: Fixnum#fdiv
+ * Document-method: Integer#fdiv
* call-seq:
- * fix.fdiv(numeric) -> float
+ * integer.fdiv(numeric) -> float
*
* Returns the floating point result of dividing +fix+ by +numeric+.
*
* 654321.fdiv(13731) #=> 47.6528293642124
* 654321.fdiv(13731.24) #=> 47.6519964693647
*
+ * -1234567890987654321.fdiv(13731) #=> -89910996357705.5
+ * -1234567890987654321.fdiv(13731.24) #=> -89909424858035.7
+ *
*/
static VALUE
@@ -3402,6 +3405,18 @@ fix_fdiv(VALUE x, VALUE y)
}
static VALUE
+int_fdiv(VALUE x, VALUE y)
+{
+ if (FIXNUM_P(x)) {
+ return fix_fdiv(x, y);
+ }
+ else if (RB_TYPE_P(x, T_BIGNUM)) {
+ return rb_big_fdiv(x, y);
+ }
+ return Qnil;
+}
+
+static VALUE
fix_divide(VALUE x, VALUE y, ID op)
{
if (FIXNUM_P(y)) {
@@ -4816,7 +4831,7 @@ Init_Numeric(void)
rb_define_method(rb_cFixnum, "%", fix_mod, 1);
rb_define_method(rb_cFixnum, "modulo", fix_mod, 1);
rb_define_method(rb_cFixnum, "divmod", fix_divmod, 1);
- rb_define_method(rb_cFixnum, "fdiv", fix_fdiv, 1);
+ rb_define_method(rb_cInteger, "fdiv", int_fdiv, 1);
rb_define_method(rb_cInteger, "**", rb_int_pow, 1);
rb_define_method(rb_cInteger, "abs", int_abs, 0);