summaryrefslogtreecommitdiff
path: root/numeric.c
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-04-26 12:09:40 (GMT)
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-04-26 12:09:40 (GMT)
commit69fbb21c12336810b0864f213c6a401c75967c3f (patch)
tree022940cb1a0221c32c731848104b4f2f9642500a /numeric.c
parent8f045eddb2dcd171b98a4dd6b018441acf4b1048 (diff)
{Fixnum,Bignum}#>> is unified into Integer.
* numeric.c (rb_int_rshift): {Fixnum,Bignum}#>> is unified into Integer. * bignum.c (rb_big_rshift): Don't define Bignum#>>. * internal.h (rb_big_rshift): Declared. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54781 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'numeric.c')
-rw-r--r--numeric.c28
1 files changed, 20 insertions, 8 deletions
diff --git a/numeric.c b/numeric.c
index 4ec8f3e..f80991a 100644
--- a/numeric.c
+++ b/numeric.c
@@ -3968,13 +3968,6 @@ fix_lshift(long val, unsigned long width)
return LONG2NUM(val);
}
-/*
- * call-seq:
- * fix >> count -> integer
- *
- * Shifts +fix+ right +count+ positions, or left if +count+ is negative.
- */
-
static VALUE
rb_fix_rshift(VALUE x, VALUE y)
{
@@ -4002,6 +3995,25 @@ fix_rshift(long val, unsigned long i)
}
/*
+ * call-seq:
+ * int >> count -> integer
+ *
+ * Shifts +int+ right +count+ positions, or left if +count+ is negative.
+ */
+
+static VALUE
+rb_int_rshift(VALUE x, VALUE y)
+{
+ if (FIXNUM_P(x)) {
+ return rb_fix_rshift(x, y);
+ }
+ else if (RB_TYPE_P(x, T_BIGNUM)) {
+ return rb_big_rshift(x, y);
+ }
+ return Qnil;
+}
+
+/*
* call-seq:
* fix[n] -> 0, 1
*
@@ -4682,7 +4694,7 @@ Init_Numeric(void)
rb_define_method(rb_cFixnum, "[]", fix_aref, 1);
rb_define_method(rb_cFixnum, "<<", rb_fix_lshift, 1);
- rb_define_method(rb_cFixnum, ">>", rb_fix_rshift, 1);
+ rb_define_method(rb_cInteger, ">>", rb_int_rshift, 1);
rb_define_method(rb_cInteger, "size", int_size, 0);
rb_define_method(rb_cInteger, "bit_length", rb_int_bit_length, 0);