From c055135030b6a0eff4e9d9bee524f3e190ac233c Mon Sep 17 00:00:00 2001 From: akr Date: Wed, 27 Apr 2016 15:35:23 +0000 Subject: {Fixnum,Bignum}#^ is unified into Integer. * numeric.c (int_xor): {Fixnum,Bignum}#^ is unified into Integer. * bignum.c (rb_big_xor): Don't define Bignum#^. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54800 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 7dd53713d9..8335a2c45c 100644 --- a/numeric.c +++ b/numeric.c @@ -3937,9 +3937,9 @@ fix_or(VALUE x, VALUE y) } /* - * Document-method: Fixnum#^ + * Document-method: Integer#^ * call-seq: - * fix ^ integer -> integer_result + * integer ^ integer -> integer_result * * Bitwise EXCLUSIVE OR. */ @@ -3960,6 +3960,18 @@ fix_xor(VALUE x, VALUE y) return rb_funcall(x, '^', 1, y); } +static VALUE +int_xor(VALUE x, VALUE y) +{ + if (FIXNUM_P(x)) { + return fix_xor(x, y); + } + else if (RB_TYPE_P(x, T_BIGNUM)) { + return rb_big_xor(x, y); + } + return Qnil; +} + /* * Document-method: Integer#<< * call-seq: @@ -4758,7 +4770,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_cFixnum, "^", fix_xor, 1); + rb_define_method(rb_cInteger, "^", int_xor, 1); rb_define_method(rb_cInteger, "[]", int_aref, 1); rb_define_method(rb_cInteger, "<<", rb_int_lshift, 1); -- cgit v1.2.3