summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--bignum.c8
-rw-r--r--numeric.c4
3 files changed, 9 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index ccf2b0a1d3..731ff9d632 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Apr 30 21:11:08 2016 Tanaka Akira <akr@fsij.org>
+
+ * 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@fsij.org>
* numeric.c (rb_int_minus): Define Integer#-.
diff --git a/bignum.c b/bignum.c
index db550a1d7d..1355ec0d1d 100644
--- a/bignum.c
+++ b/bignum.c
@@ -5767,13 +5767,6 @@ bigadd(VALUE x, VALUE y, int sign)
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)
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);
diff --git a/numeric.c b/numeric.c
index be66fd0685..8214873fc1 100644
--- a/numeric.c
+++ b/numeric.c
@@ -3223,9 +3223,10 @@ rb_int2str(VALUE x, int base)
}
/*
+ * 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)
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);