summaryrefslogtreecommitdiff
path: root/array.c
diff options
context:
space:
mode:
authormrkn <mrkn@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-05-01 15:02:47 (GMT)
committermrkn <mrkn@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-05-01 15:02:47 (GMT)
commit78729a59a2ad0269b79655d7f6da8fe8175f25e2 (patch)
tree570aa93bcaab83e5c008ff78e997ce719571943b /array.c
parentb1376614deef85185f143c7fc799afe01429582a (diff)
Fix rb_ary_sum for mathn
* array.c (rb_ary_sum): fix for mathn * test/ruby/test_array.rb (test_sum): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54870 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'array.c')
-rw-r--r--array.c22
1 files changed, 18 insertions, 4 deletions
diff --git a/array.c b/array.c
index 5a0d8aa..8b68320 100644
--- a/array.c
+++ b/array.c
@@ -5732,15 +5732,29 @@ rb_ary_sum(int argc, VALUE *argv, VALUE ary)
}
if (n != 0)
v = rb_fix_plus(LONG2FIX(n), v);
- if (r != Qundef)
- v = rb_rational_plus(r, v);
+ if (r != Qundef) {
+ /* r can be a Integer when mathn is loaded */
+ if (FIXNUM_P(r))
+ v = rb_fix_plus(r, v);
+ else if (RB_TYPE_P(r, T_BIGNUM))
+ v = rb_big_plus(r, v);
+ else
+ v = rb_rational_plus(r, v);
+ }
return v;
not_exact:
if (n != 0)
v = rb_fix_plus(LONG2FIX(n), v);
- if (r != Qundef)
- v = rb_rational_plus(r, v);
+ if (r != Qundef) {
+ /* r can be a Integer when mathn is loaded */
+ if (FIXNUM_P(r))
+ v = rb_fix_plus(r, v);
+ else if (RB_TYPE_P(r, T_BIGNUM))
+ v = rb_big_plus(r, v);
+ else
+ v = rb_rational_plus(r, v);
+ }
if (RB_FLOAT_TYPE_P(e)) {
/* Kahan's compensated summation algorithm */