diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | numeric.c | 4 |
2 files changed, 8 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Fri Sep 16 02:05:44 2011 Marc-Andre Lafortune <ruby-core@marc-andre.ca> + + * numeric.c (ruby_float_step): Avoid error on i386 and amd64. + Patch by Vit Ondruch. Issue #4576. + Thu Sep 15 11:39:43 2011 Nobuyoshi Nakada <nobu@ruby-lang.org> * gc.c (mark_entry, mark_key, mark_keyvalue): adjust callback @@ -1683,6 +1683,7 @@ ruby_float_step(VALUE from, VALUE to, VALUE step, int excl) double unit = NUM2DBL(step); double n = (end - beg)/unit; double err = (fabs(beg) + fabs(end) + fabs(end-beg)) / fabs(unit) * epsilon; + double im = 0.0; long i; if (isinf(unit)) { @@ -1691,7 +1692,8 @@ ruby_float_step(VALUE from, VALUE to, VALUE step, int excl) else { if (err>0.5) err=0.5; n = floor(n + err); - if (!excl || ((long)n)*unit+beg < end) n++; + im = ((long)n)*unit+beg; + if (!excl || im < end) n++; for (i=0; i<n; i++) { rb_yield(DBL2NUM(i*unit+beg)); } |