summaryrefslogtreecommitdiff
path: root/numeric.c
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-04-26 12:23:05 (GMT)
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-04-26 12:23:05 (GMT)
commit06ca50338b15d2931c0fa04faa718d00e71092f7 (patch)
tree97d0dbf23437c1210431c17aeb082dfddcbe67d3 /numeric.c
parent69fbb21c12336810b0864f213c6a401c75967c3f (diff)
{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
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 f80991a..36432b2 100644
--- a/numeric.c
+++ b/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);