{Fixnum,Bignum}#~ is unified into Integer.

* numeric.c (int_comp): {Fixnum,Bignum}#~ is unified into
  Integer.

* bignum.c (rb_big_neg): Don't define Bignum#~.

* internal.h (rb_big_neg): Declared.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54829 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

4 files changed, 34 insertions, 17 deletions

diff --git a/ChangeLog b/ChangeLog
index 5336bdacd7..9b380a63ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Sat Apr 30 12:25:43 2016  Tanaka Akira  <akr@fsij.org>
+
+	* numeric.c (int_comp): {Fixnum,Bignum}#~ is unified into
+	  Integer.
+
+	* bignum.c (rb_big_neg): Don't define Bignum#~.
+
+	* internal.h (rb_big_neg): Declared.
+
 Sat Apr 30 12:07:42 2016  Tanaka Akira  <akr@fsij.org>
 
 	* numeric.c (int_and): {Fixnum,Bignum}#& is unified into
diff --git a/bignum.c b/bignum.c
index 891c27c77f..77f44ad21a 100644
--- a/bignum.c
+++ b/bignum.c
@@ -5546,19 +5546,7 @@ rb_big_uminus(VALUE x)
     return bignorm(z);
 }
 
-/*
- * call-seq:
- *     ~big  ->  integer
- *
- * Inverts the bits in big. As Bignums are conceptually infinite
- * length, the result acts as if it had an infinite number of one
- * bits to the left. In hex representations, this is displayed
- * as two periods to the left of the digits.
- *
- *   sprintf("%X", ~0x1122334455)    #=> "..FEEDDCCBBAA"
- */
-
-static VALUE
+VALUE
 rb_big_neg(VALUE x)
 {
     VALUE z = rb_big_clone(x);
@@ -6963,7 +6951,6 @@ Init_Bignum(void)
     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_pow, 1);
-    rb_define_method(rb_cBignum, "~", rb_big_neg, 0);
 
     rb_define_method(rb_cBignum, "==", rb_big_eq, 1);
     rb_define_method(rb_cBignum, ">", big_gt, 1);
diff --git a/internal.h b/internal.h
index 148f160c62..bd2de89400 100644
--- a/internal.h
+++ b/internal.h
@@ -781,6 +781,7 @@ size_t rb_big_size(VALUE);
 VALUE rb_integer_float_cmp(VALUE x, VALUE y);
 VALUE rb_integer_float_eq(VALUE x, VALUE y);
 VALUE rb_cstr_parse_inum(const char *str, ssize_t len, char **endp, int base);
+VALUE rb_big_neg(VALUE x);
 VALUE rb_big_aref(VALUE x, VALUE y);
 VALUE rb_big_abs(VALUE x);
 VALUE rb_big_size_m(VALUE big);
diff --git a/numeric.c b/numeric.c
index 948cba9a79..6cd0d45879 100644
--- a/numeric.c
+++ b/numeric.c
@@ -3854,11 +3854,19 @@ fix_le(VALUE x, VALUE y)
 }
 
 /*
- * Document-method: Fixnum#~
+ * Document-method: Integer#~
  * call-seq:
- *   ~fix  ->  integer
+ *   ~integer  ->  integer
  *
  * One's complement: returns a number where each bit is flipped.
+ *
+ * Inverts the bits in a integer. As Integers are conceptually infinite
+ * length, the result acts as if it had an infinite number of one
+ * bits to the left. In hex representations, this is displayed
+ * as two periods to the left of the digits.
+ *
+ *   sprintf("%X", ~0x1122334455)    #=> "..FEEDDCCBBAA"
+ *
  */
 
 static VALUE
@@ -3867,6 +3875,18 @@ fix_rev(VALUE num)
     return ~num | FIXNUM_FLAG;
 }
 
+static VALUE
+int_comp(VALUE num)
+{
+    if (FIXNUM_P(num)) {
+	return fix_rev(num);
+    }
+    else if (RB_TYPE_P(num, T_BIGNUM)) {
+	return rb_big_neg(num);
+    }
+    return Qnil;
+}
+
 static int
 bit_coerce(VALUE *x, VALUE *y)
 {
@@ -4791,7 +4811,7 @@ Init_Numeric(void)
     rb_define_method(rb_cFixnum, "<",  fix_lt, 1);
     rb_define_method(rb_cFixnum, "<=", fix_le, 1);
 
-    rb_define_method(rb_cFixnum, "~", fix_rev, 0);
+    rb_define_method(rb_cInteger, "~", int_comp, 0);
     rb_define_method(rb_cInteger, "&", int_and, 1);
     rb_define_method(rb_cInteger, "|", int_or,  1);
     rb_define_method(rb_cInteger, "^", int_xor, 1);