1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* 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
This commit is contained in:
akr 2016-04-27 15:35:23 +00:00
parent c71e02bd07
commit f949a95dab
3 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Thu Apr 28 00:27:55 2016 Tanaka Akira <akr@fsij.org>
* numeric.c (int_xor): {Fixnum,Bignum}#^ is unified into
Integer.
* bignum.c (rb_big_xor): Don't define Bignum#^.
Wed Apr 27 20:53:59 2016 Tanaka Akira <akr@fsij.org> Wed Apr 27 20:53:59 2016 Tanaka Akira <akr@fsij.org>
* numeric.c (int_aref): {Fixnum,Bignum}#[] is unified into * numeric.c (int_aref): {Fixnum,Bignum}#[] is unified into

7
bignum.c
View File

@ -6656,12 +6656,6 @@ bigxor_int(VALUE x, long xn, BDIGIT hibitsx, long y)
RB_GC_GUARD(x); RB_GC_GUARD(x);
return bignorm(z); return bignorm(z);
} }
/*
* call-seq:
* big ^ numeric -> integer
*
* Performs bitwise +exclusive or+ between _big_ and _numeric_.
*/
VALUE VALUE
rb_big_xor(VALUE x, VALUE y) rb_big_xor(VALUE x, VALUE y)
@ -6985,7 +6979,6 @@ Init_Bignum(void)
rb_define_method(rb_cBignum, "**", rb_big_pow, 1); rb_define_method(rb_cBignum, "**", rb_big_pow, 1);
rb_define_method(rb_cBignum, "&", rb_big_and, 1); rb_define_method(rb_cBignum, "&", rb_big_and, 1);
rb_define_method(rb_cBignum, "|", rb_big_or, 1); rb_define_method(rb_cBignum, "|", rb_big_or, 1);
rb_define_method(rb_cBignum, "^", rb_big_xor, 1);
rb_define_method(rb_cBignum, "~", rb_big_neg, 0); rb_define_method(rb_cBignum, "~", rb_big_neg, 0);
rb_define_method(rb_cBignum, "==", rb_big_eq, 1); rb_define_method(rb_cBignum, "==", rb_big_eq, 1);

18
numeric.c
View File

@ -3937,9 +3937,9 @@ fix_or(VALUE x, VALUE y)
} }
/* /*
* Document-method: Fixnum#^ * Document-method: Integer#^
* call-seq: * call-seq:
* fix ^ integer -> integer_result * integer ^ integer -> integer_result
* *
* Bitwise EXCLUSIVE OR. * Bitwise EXCLUSIVE OR.
*/ */
@ -3960,6 +3960,18 @@ fix_xor(VALUE x, VALUE y)
return rb_funcall(x, '^', 1, 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#<< * Document-method: Integer#<<
* call-seq: * call-seq:
@ -4758,7 +4770,7 @@ Init_Numeric(void)
rb_define_method(rb_cFixnum, "~", fix_rev, 0); rb_define_method(rb_cFixnum, "~", fix_rev, 0);
rb_define_method(rb_cFixnum, "&", fix_and, 1); rb_define_method(rb_cFixnum, "&", fix_and, 1);
rb_define_method(rb_cFixnum, "|", fix_or, 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, "[]", int_aref, 1);
rb_define_method(rb_cInteger, "<<", rb_int_lshift, 1); rb_define_method(rb_cInteger, "<<", rb_int_lshift, 1);