зеркало из https://github.com/github/ruby.git
{Fixnum,Bignum}#<< is unified into Integer.
* numeric.c (rb_int_lshift): {Fixnum,Bignum}#<< is unified into Integer. * bignum.c (rb_big_lshift): Don't define Bignum#<<. * internal.h (rb_big_lshift): Declared. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54782 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
Родитель
69fbb21c12
Коммит
06ca50338b
|
@ -1,3 +1,12 @@
|
|||
Tue Apr 26 21:11:02 2016 Tanaka Akira <akr@fsij.org>
|
||||
|
||||
* numeric.c (rb_int_lshift): {Fixnum,Bignum}#<< is unified into
|
||||
Integer.
|
||||
|
||||
* bignum.c (rb_big_lshift): Don't define Bignum#<<.
|
||||
|
||||
* internal.h (rb_big_lshift): Declared.
|
||||
|
||||
Tue Apr 26 20:59:40 2016 Tanaka Akira <akr@fsij.org>
|
||||
|
||||
* numeric.c (rb_int_rshift): {Fixnum,Bignum}#>> is unified into
|
||||
|
|
1
bignum.c
1
bignum.c
|
@ -7013,7 +7013,6 @@ Init_Bignum(void)
|
|||
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_lshift, 1);
|
||||
rb_define_method(rb_cBignum, "[]", rb_big_aref, 1);
|
||||
|
||||
rb_define_method(rb_cBignum, "==", rb_big_eq, 1);
|
||||
|
|
28
numeric.c
28
numeric.c
|
@ -3936,13 +3936,6 @@ fix_xor(VALUE x, VALUE y)
|
|||
return rb_funcall(x, '^', 1, y);
|
||||
}
|
||||
|
||||
/*
|
||||
* call-seq:
|
||||
* fix << count -> integer
|
||||
*
|
||||
* Shifts +fix+ left +count+ positions, or right if +count+ is negative.
|
||||
*/
|
||||
|
||||
static VALUE
|
||||
rb_fix_lshift(VALUE x, VALUE y)
|
||||
{
|
||||
|
@ -3968,6 +3961,25 @@ fix_lshift(long val, unsigned long width)
|
|||
return LONG2NUM(val);
|
||||
}
|
||||
|
||||
/*
|
||||
* call-seq:
|
||||
* fix << count -> integer
|
||||
*
|
||||
* Shifts +fix+ left +count+ positions, or right if +count+ is negative.
|
||||
*/
|
||||
|
||||
static VALUE
|
||||
rb_int_lshift(VALUE x, VALUE y)
|
||||
{
|
||||
if (FIXNUM_P(x)) {
|
||||
return rb_fix_lshift(x, y);
|
||||
}
|
||||
else if (RB_TYPE_P(x, T_BIGNUM)) {
|
||||
return rb_big_lshift(x, y);
|
||||
}
|
||||
return Qnil;
|
||||
}
|
||||
|
||||
static VALUE
|
||||
rb_fix_rshift(VALUE x, VALUE y)
|
||||
{
|
||||
|
@ -4693,7 +4705,7 @@ Init_Numeric(void)
|
|||
rb_define_method(rb_cFixnum, "^", fix_xor, 1);
|
||||
rb_define_method(rb_cFixnum, "[]", fix_aref, 1);
|
||||
|
||||
rb_define_method(rb_cFixnum, "<<", rb_fix_lshift, 1);
|
||||
rb_define_method(rb_cInteger, "<<", rb_int_lshift, 1);
|
||||
rb_define_method(rb_cInteger, ">>", rb_int_rshift, 1);
|
||||
|
||||
rb_define_method(rb_cInteger, "size", int_size, 0);
|
||||
|
|
Загрузка…
Ссылка в новой задаче