summaryrefslogtreecommitdiff
path: root/numeric.c
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-04-30 03:08:53 (GMT)
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-04-30 03:08:53 (GMT)
commitb296cacb123cd0bbf9ca1efae66f1fcb7c1caae0 (patch)
treec9bc8db7ae77b3cc776ff26c7d6fcae20f7b39ca /numeric.c
parent23603c27ee7efca6fbee6e4f87de10be3e7e8303 (diff)
{Fixnum,Bignum}#& is unified into Integer.
* numeric.c (int_and): {Fixnum,Bignum}#& is unified into Integer. * bignum.c (rb_big_and): Don't define Bignum#|. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54828 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'numeric.c')
-rw-r--r--numeric.c18
1 files changed, 15 insertions, 3 deletions
diff --git a/numeric.c b/numeric.c
index 95a77d5..948cba9 100644
--- a/numeric.c
+++ b/numeric.c
@@ -3889,9 +3889,9 @@ rb_num_coerce_bit(VALUE x, VALUE y, ID func)
}
/*
- * Document-method: Fixnum#&
+ * Document-method: Integer#&
* call-seq:
- * fix & integer -> integer_result
+ * integer & integer -> integer_result
*
* Bitwise AND.
*/
@@ -3912,6 +3912,18 @@ fix_and(VALUE x, VALUE y)
return rb_funcall(x, '&', 1, y);
}
+static VALUE
+int_and(VALUE x, VALUE y)
+{
+ if (FIXNUM_P(x)) {
+ return fix_and(x, y);
+ }
+ else if (RB_TYPE_P(x, T_BIGNUM)) {
+ return rb_big_and(x, y);
+ }
+ return Qnil;
+}
+
/*
* Document-method: Integer#|
* call-seq:
@@ -4780,7 +4792,7 @@ Init_Numeric(void)
rb_define_method(rb_cFixnum, "<=", fix_le, 1);
rb_define_method(rb_cFixnum, "~", fix_rev, 0);
- rb_define_method(rb_cFixnum, "&", fix_and, 1);
+ rb_define_method(rb_cInteger, "&", int_and, 1);
rb_define_method(rb_cInteger, "|", int_or, 1);
rb_define_method(rb_cInteger, "^", int_xor, 1);
rb_define_method(rb_cInteger, "[]", int_aref, 1);