diff options
author | mrkn <mrkn@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-03-23 12:50:24 +0000 |
---|---|---|
committer | mrkn <mrkn@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-03-23 12:50:24 +0000 |
commit | a06790381b938e5e8b29e500ac4f455b103c4783 (patch) | |
tree | 89a83bc4c1c0a7895f8683151acd40cfa615f49c | |
parent | ca21c0a6ac6f49d0435d5817434d500ab422dbf7 (diff) | |
download | ruby-a06790381b938e5e8b29e500ac4f455b103c4783.tar.gz |
* enum.c (ary_inject_op): put subtract operation out of if-clause.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54238 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | enum.c | 9 |
2 files changed, 9 insertions, 4 deletions
@@ -1,3 +1,7 @@ +Wed Mar 23 21:48:00 2016 Kenta Murata <mrkn@mrkn.jp> + + * enum.c (ary_inject_op): put subtract operation out of if-clause. + Wed Mar 23 21:38:00 2016 Kenta Murata <mrkn@mrkn.jp> * enum.c (ary_inject_op): Use Kahan's compensated summation algorithm @@ -688,17 +688,18 @@ ary_inject_op(VALUE ary, VALUE init, VALUE op) sum_float: c = 0.0; while (1) { - double y, t; + double x, y, t; e = RARRAY_AREF(ary, i); if (RB_FLOAT_TYPE_P(e)) - y = RFLOAT_VALUE(e) - c; + x = RFLOAT_VALUE(e); else if (FIXNUM_P(e)) - y = FIX2LONG(e) - c; + x = FIX2LONG(e); else if (RB_TYPE_P(e, T_BIGNUM)) - y = rb_big2dbl(e) - c; + x = rb_big2dbl(e); else break; + y = x - c; t = f + y; c = (t - f) - y; f = t; |