diff options
author | Jeremy Evans <code@jeremyevans.net> | 2021-04-29 12:51:05 -0700 |
---|---|---|
committer | Jeremy Evans <code@jeremyevans.net> | 2021-05-29 08:56:15 -0700 |
commit | f516379853f36d143d820c55d5eeaa9fc410ef52 (patch) | |
tree | e5a9e14896dee5767d0d33834613bd56c590ce66 /numeric.c | |
parent | e56ba6231f77dd0aa88a1ce737a342baafc884c7 (diff) | |
download | ruby-f516379853f36d143d820c55d5eeaa9fc410ef52.tar.gz |
Fix Enumerator::ArithmeticSequence handling of float ranges
Depending on the float range, there could be an off-by-one error,
where the last result that should be in the range was missed. Fix
this by checking if the computed value for the expected value
outside the range is still inside the range, and if so, increment
the step size.
Fixes [Bug #16612]
Diffstat (limited to 'numeric.c')
-rw-r--r-- | numeric.c | 20 |
1 files changed, 18 insertions, 2 deletions
@@ -2409,11 +2409,11 @@ ruby_float_step_size(double beg, double end, double unit, int excl) if (unit == 0) { return HUGE_VAL; } - n= (end - beg)/unit; - err = (fabs(beg) + fabs(end) + fabs(end-beg)) / fabs(unit) * epsilon; if (isinf(unit)) { return unit > 0 ? beg <= end : beg >= end; } + n= (end - beg)/unit; + err = (fabs(beg) + fabs(end) + fabs(end-beg)) / fabs(unit) * epsilon; if (err>0.5) err=0.5; if (excl) { if (n<=0) return 0; @@ -2421,10 +2421,26 @@ ruby_float_step_size(double beg, double end, double unit, int excl) n = 0; else n = floor(n - err); + if (beg < end) { + if ((n+1)*unit+beg < end) + n++; + } + else if (beg > end) { + if ((n+1)*unit+beg > end) + n++; + } } else { if (n<0) return 0; n = floor(n + err); + if (beg < end) { + if ((n+1)*unit+beg <= end) + n++; + } + else if (beg > end) { + if ((n+1)*unit+beg >= end) + n++; + } } return n+1; } |