[前][次][番号順一覧][スレッド一覧]

ruby-changes:42707

From: akr <ko1@a...>
Date: Tue, 26 Apr 2016 20:13:04 +0900 (JST)
Subject: [ruby-changes:42707] akr:r54781 (trunk): {Fixnum, Bignum}#>> is unified into Integer.

akr	2016-04-26 21:09:40 +0900 (Tue, 26 Apr 2016)

  New Revision: 54781

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=54781

  Log:
    {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.

  Modified files:
    trunk/ChangeLog
    trunk/bignum.c
    trunk/numeric.c
Index: bignum.c
===================================================================
--- bignum.c	(revision 54780)
+++ bignum.c	(revision 54781)
@@ -6748,14 +6748,6 @@ rb_big_lshift(VALUE x, VALUE y) https://github.com/ruby/ruby/blob/trunk/bignum.c#L6748
     }
 }
 
-
-/*
- * call-seq:
- *     big >> numeric   ->  integer
- *
- * Shifts big right _numeric_ positions (left if _numeric_ is negative).
- */
-
 VALUE
 rb_big_rshift(VALUE x, VALUE y)
 {
@@ -7022,7 +7014,6 @@ Init_Bignum(void) https://github.com/ruby/ruby/blob/trunk/bignum.c#L7014
     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_rshift, 1);
     rb_define_method(rb_cBignum, "[]", rb_big_aref, 1);
 
     rb_define_method(rb_cBignum, "==", rb_big_eq, 1);
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 54780)
+++ ChangeLog	(revision 54781)
@@ -1,3 +1,12 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Tue Apr 26 20:59:40 2016  Tanaka Akira  <akr@f...>
+
+	* 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.
+
 Tue Apr 26 20:46:16 2016  Tanaka Akira  <akr@f...>
 
 	* numeric.c (int_size): {Fixnum,Bignum}#size is unified into Integer.
Index: numeric.c
===================================================================
--- numeric.c	(revision 54780)
+++ numeric.c	(revision 54781)
@@ -3968,13 +3968,6 @@ fix_lshift(long val, unsigned long width https://github.com/ruby/ruby/blob/trunk/numeric.c#L3968
     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) https://github.com/ruby/ruby/blob/trunk/numeric.c#L3995
 }
 
 /*
+ * 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) https://github.com/ruby/ruby/blob/trunk/numeric.c#L4694
     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);

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]