3 files changed, 23 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog
index 0992eea0c2..ba55ed694a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sat Apr 30 14:04:30 2016  Tanaka Akira  <akr@fsij.org>
+
+	* numeric.c (int_divmod): {Fixnum,Bignum}#divmod is unified into
+	  Integer.
+
+	* bignum.c (rb_big_divmod): Don't define Bignum#divmod.
+
 Sat Apr 30 13:20:00 2016  Tanaka Akira  <akr@fsij.org>
 
 	* numeric.c (int_fdiv): {Fixnum,Bignum}#fdiv is unified into
diff --git a/bignum.c b/bignum.c
index 5b1e97db25..53dac8ad0b 100644
--- a/bignum.c
+++ b/bignum.c
@@ -6176,13 +6176,6 @@ rb_big_remainder(VALUE x, VALUE y)
     return bignorm(z);
 }
 
-/*
- *  call-seq:
- *     big.divmod(numeric)   -> array
- *
- *  See <code>Numeric#divmod</code>.
- *
- */
 VALUE
 rb_big_divmod(VALUE x, VALUE y)
 {
@@ -6920,7 +6913,6 @@ Init_Bignum(void)
     rb_define_method(rb_cBignum, "/", rb_big_div, 1);
     rb_define_method(rb_cBignum, "%", rb_big_modulo, 1);
     rb_define_method(rb_cBignum, "div", rb_big_idiv, 1);
-    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);
 
diff --git a/numeric.c b/numeric.c
index 95444b3b63..f291e3a948 100644
--- a/numeric.c
+++ b/numeric.c
@@ -3536,11 +3536,11 @@ rb_int_modulo(VALUE x, VALUE y)
 }
 
 /*
- *  Document-method: Fixnum#divmod
+ *  Document-method: Integer#divmod
  *  call-seq:
- *     fix.divmod(numeric)  ->  array
+ *     integer.divmod(numeric)  ->  array
  *
- *  See Numeric#divmod.
+ *  See <code>Numeric#divmod</code>.
  */
 static VALUE
 fix_divmod(VALUE x, VALUE y)
@@ -3571,6 +3571,18 @@ fix_divmod(VALUE x, VALUE y)
     }
 }
 
+static VALUE
+int_divmod(VALUE x, VALUE y)
+{
+    if (FIXNUM_P(x)) {
+	return fix_divmod(x, y);
+    }
+    else if (RB_TYPE_P(x, T_BIGNUM)) {
+	return rb_big_divmod(x, y);
+    }
+    return Qnil;
+}
+
 /*
  *  Document-method: Integer#**
  *  call-seq:
@@ -4830,7 +4842,7 @@ Init_Numeric(void)
     rb_define_method(rb_cFixnum, "div", fix_idiv, 1);
     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_cInteger, "divmod", int_divmod, 1);
     rb_define_method(rb_cInteger, "fdiv", int_fdiv, 1);
     rb_define_method(rb_cInteger, "**", rb_int_pow, 1);