From f4893dea97b755ef34aacaf692b9ac77faa5bfda Mon Sep 17 00:00:00 2001 From: akr Date: Sat, 30 Apr 2016 03:08:53 +0000 Subject: {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 --- numeric.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) (limited to 'numeric.c') diff --git a/numeric.c b/numeric.c index 95a77d5e4c..948cba9a79 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); -- cgit v1.2.3