From 4633d83126d25d0427de1c3a326cd933c64b4886 Mon Sep 17 00:00:00 2001
From: akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 30 Apr 2016 04:20:56 +0000
Subject: {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
---
 ChangeLog |  7 +++++++
 bignum.c  | 14 --------------
 numeric.c | 21 ++++++++++++++++++---
 3 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 763088c3a7..0992eea0c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sat Apr 30 13:20:00 2016  Tanaka Akira  <akr@fsij.org>
+
+	* numeric.c (int_fdiv): {Fixnum,Bignum}#fdiv is unified into
+	  Integer.
+
+	* bignum.c (rb_big_fdiv): Don't define Bignum#fdiv.
+
 Sat Apr 30 12:25:43 2016  Tanaka Akira  <akr@fsij.org>
 
 	* numeric.c (rb_int_pow): {Fixnum,Bignum}#** is unified into
diff --git a/bignum.c b/bignum.c
index bb6b8fb05d..5b1e97db25 100644
--- a/bignum.c
+++ b/bignum.c
@@ -6254,19 +6254,6 @@ big_fdiv_float(VALUE x, VALUE y)
     return big_fdiv(x, y, i - DBL_MANT_DIG);
 }
 
-/*
- *  call-seq:
-  *     big.fdiv(numeric) -> float
- *
- *  Returns the floating point result of dividing <i>big</i> by
- *  <i>numeric</i>.
- *
- *     -1234567890987654321.fdiv(13731)      #=> -89910996357705.5
- *     -1234567890987654321.fdiv(13731.24)   #=> -89909424858035.7
- *
- */
-
-
 VALUE
 rb_big_fdiv(VALUE x, VALUE y)
 {
@@ -6936,7 +6923,6 @@ Init_Bignum(void)
     rb_define_method(rb_cBignum, "divmod", rb_big_divmod, 1);
     rb_define_method(rb_cBignum, "modulo", rb_big_modulo, 1);
     rb_define_method(rb_cBignum, "remainder", rb_big_remainder, 1);
-    rb_define_method(rb_cBignum, "fdiv", rb_big_fdiv, 1);
 
     rb_define_method(rb_cBignum, "==", rb_big_eq, 1);
     rb_define_method(rb_cBignum, ">", big_gt, 1);
diff --git a/numeric.c b/numeric.c
index 0ef31b7053..b6ab927354 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
@@ -3401,6 +3404,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)
 {
@@ -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);
-- 
cgit v1.2.3