summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--array.c2
-rw-r--r--internal.h2
-rw-r--r--rational.c4
4 files changed, 13 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 727df82..85e45b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Fri Apr 15 23:52:00 2016 Kenta Murata <mrkn@mrkn.jp>
+
+ * rational.c (rb_rational_plus): rename from rb_rational_add
+ to be aligned with rb_fix_plus.
+
+ * array.c (rb_ary_sum): ditto.
+
+ * internal.h: ditto.
+
Fri Apr 15 23:42:00 2016 Kenta Murata <mrkn@mrkn.jp>
* rational.c (rb_rational_add): rename from nurat_add.
diff --git a/array.c b/array.c
index 2bb31dd..8e50449 100644
--- a/array.c
+++ b/array.c
@@ -5762,7 +5762,7 @@ rb_ary_sum(int argc, VALUE *argv, VALUE ary)
v = rb_to_float(v);
goto float_value;
}
- v = rb_rational_add(e, v);
+ v = rb_rational_plus(e, v);
}
return v;
}
diff --git a/internal.h b/internal.h
index 77fad73..96f110f 100644
--- a/internal.h
+++ b/internal.h
@@ -1204,7 +1204,7 @@ rb_pid_t rb_fork_ruby(int *status);
void rb_last_status_clear(void);
/* rational.c */
-VALUE rb_rational_add(VALUE self, VALUE other);
+VALUE rb_rational_plus(VALUE self, VALUE other);
VALUE rb_lcm(VALUE x, VALUE y);
VALUE rb_rational_reciprocal(VALUE x);
VALUE rb_cstr_to_rat(const char *, int);
diff --git a/rational.c b/rational.c
index 8624ea1..f4b34da 100644
--- a/rational.c
+++ b/rational.c
@@ -742,7 +742,7 @@ f_addsub(VALUE self, VALUE anum, VALUE aden, VALUE bnum, VALUE bden, int k)
* Rational(20, 9) + 9.8 #=> 12.022222222222222
*/
VALUE
-rb_rational_add(VALUE self, VALUE other)
+rb_rational_plus(VALUE self, VALUE other)
{
if (RB_TYPE_P(other, T_FIXNUM) || RB_TYPE_P(other, T_BIGNUM)) {
{
@@ -2538,7 +2538,7 @@ Init_Rational(void)
rb_define_method(rb_cRational, "numerator", nurat_numerator, 0);
rb_define_method(rb_cRational, "denominator", nurat_denominator, 0);
- rb_define_method(rb_cRational, "+", rb_rational_add, 1);
+ rb_define_method(rb_cRational, "+", rb_rational_plus, 1);
rb_define_method(rb_cRational, "-", nurat_sub, 1);
rb_define_method(rb_cRational, "*", nurat_mul, 1);
rb_define_method(rb_cRational, "/", nurat_div, 1);