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

ruby-changes:42776

From: akr <ko1@a...>
Date: Sat, 30 Apr 2016 20:27:30 +0900 (JST)
Subject: [ruby-changes:42776] akr:r54850 (trunk): Define Integer#+ instead of Bignum#+.

akr	2016-04-30 21:24:06 +0900 (Sat, 30 Apr 2016)

  New Revision: 54850

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

  Log:
    Define Integer#+ instead of Bignum#+.
    
    * numeric.c (rb_int_plus): Define Integer#+.
    
    * bignum.c (rb_big_plus): Don't define Bignum#+.

  Modified files:
    trunk/ChangeLog
    trunk/bignum.c
    trunk/numeric.c
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 54849)
+++ ChangeLog	(revision 54850)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Sat Apr 30 21:11:08 2016  Tanaka Akira  <akr@f...>
+
+	* numeric.c (rb_int_plus): Define Integer#+.
+
+	* bignum.c (rb_big_plus): Don't define Bignum#+.
+
 Sat Apr 30 21:01:20 2016  Tanaka Akira  <akr@f...>
 
 	* numeric.c (rb_int_minus): Define Integer#-.
Index: numeric.c
===================================================================
--- numeric.c	(revision 54849)
+++ numeric.c	(revision 54850)
@@ -3223,9 +3223,10 @@ rb_int2str(VALUE x, int base) https://github.com/ruby/ruby/blob/trunk/numeric.c#L3223
 }
 
 /*
+ * Document-method: Integer#+
  * Document-method: Fixnum#+
  * call-seq:
- *   fix + numeric  ->  numeric_result
+ *   int + numeric  ->  numeric_result
  *
  * Performs addition: the class of the resulting object depends on the class of
  * +numeric+ and on the magnitude of the result. It may return a Bignum.
@@ -4940,6 +4941,7 @@ Init_Numeric(void) https://github.com/ruby/ruby/blob/trunk/numeric.c#L4941
 
     rb_define_method(rb_cInteger, "-@", rb_int_uminus, 0);
     rb_define_method(rb_cFixnum, "+", fix_plus, 1);
+    rb_define_method(rb_cInteger, "+", rb_int_plus, 1);
     rb_define_method(rb_cFixnum, "-", fix_minus, 1);
     rb_define_method(rb_cInteger, "-", rb_int_minus, 1);
     rb_define_method(rb_cFixnum, "*", fix_mul, 1);
Index: bignum.c
===================================================================
--- bignum.c	(revision 54849)
+++ bignum.c	(revision 54850)
@@ -5767,13 +5767,6 @@ bigadd(VALUE x, VALUE y, int sign) https://github.com/ruby/ruby/blob/trunk/bignum.c#L5767
     return z;
 }
 
-/*
- *  call-seq:
- *     big + other  -> Numeric
- *
- *  Adds big and other, returning the result.
- */
-
 VALUE
 rb_big_plus(VALUE x, VALUE y)
 {
@@ -6828,7 +6821,6 @@ Init_Bignum(void) https://github.com/ruby/ruby/blob/trunk/bignum.c#L6821
     rb_cBignum = rb_define_class("Bignum", rb_cInteger);
 
     rb_define_method(rb_cBignum, "coerce", rb_big_coerce, 1);
-    rb_define_method(rb_cBignum, "+", rb_big_plus, 1);
     rb_define_method(rb_cBignum, "/", rb_big_div, 1);
 
     rb_define_method(rb_cBignum, "===", rb_big_eq, 1);

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

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