From 44af023d44decaa58225304176898663734af07b Mon Sep 17 00:00:00 2001 From: akr Date: Sat, 30 Apr 2016 02:54:14 +0000 Subject: {Fixnum,Bignum}#| is unified into Integer. * numeric.c (int_or): {Fixnum,Bignum}#| is unified into Integer. * bignum.c (rb_big_or): Don't define Bignum#|. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54825 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 8335a2c45c..95a77d5e4c 100644 --- a/numeric.c +++ b/numeric.c @@ -3913,9 +3913,9 @@ fix_and(VALUE x, VALUE y) } /* - * Document-method: Fixnum#| + * Document-method: Integer#| * call-seq: - * fix | integer -> integer_result + * integer | integer -> integer_result * * Bitwise OR. */ @@ -3936,6 +3936,18 @@ fix_or(VALUE x, VALUE y) return rb_funcall(x, '|', 1, y); } +static VALUE +int_or(VALUE x, VALUE y) +{ + if (FIXNUM_P(x)) { + return fix_or(x, y); + } + else if (RB_TYPE_P(x, T_BIGNUM)) { + return rb_big_or(x, y); + } + return Qnil; +} + /* * Document-method: Integer#^ * call-seq: @@ -4769,7 +4781,7 @@ Init_Numeric(void) rb_define_method(rb_cFixnum, "~", fix_rev, 0); rb_define_method(rb_cFixnum, "&", fix_and, 1); - rb_define_method(rb_cFixnum, "|", fix_or, 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