diff options
Diffstat (limited to 'mrbgems/mruby-range-ext/src/range.c')
| -rw-r--r-- | mrbgems/mruby-range-ext/src/range.c | 33 |
1 files changed, 23 insertions, 10 deletions
diff --git a/mrbgems/mruby-range-ext/src/range.c b/mrbgems/mruby-range-ext/src/range.c index 4d6f1684f..1d9312b03 100644 --- a/mrbgems/mruby-range-ext/src/range.c +++ b/mrbgems/mruby-range-ext/src/range.c @@ -1,6 +1,7 @@ #include <mruby.h> #include <mruby/range.h> #include <math.h> +#include <float.h> static mrb_bool r_le(mrb_state *mrb, mrb_value a, mrb_value b) @@ -138,13 +139,15 @@ mrb_range_size(mrb_state *mrb, mrb_value range) { struct RRange *r = mrb_range_ptr(range); mrb_value beg, end; - double beg_f, end_f; + mrb_float beg_f, end_f; mrb_bool num_p = TRUE; + mrb_bool excl; beg = r->edges->beg; end = r->edges->end; + excl = r->excl; if (mrb_fixnum_p(beg)) { - beg_f = (double)mrb_fixnum(beg); + beg_f = (mrb_float)mrb_fixnum(beg); } else if (mrb_float_p(beg)) { beg_f = mrb_float(beg); @@ -153,7 +156,7 @@ mrb_range_size(mrb_state *mrb, mrb_value range) num_p = FALSE; } if (mrb_fixnum_p(end)) { - end_f = (double)mrb_fixnum(end); + end_f = (mrb_float)mrb_fixnum(end); } else if (mrb_float_p(end)) { end_f = mrb_float(end); @@ -162,14 +165,24 @@ mrb_range_size(mrb_state *mrb, mrb_value range) num_p = FALSE; } if (num_p) { - double f; - - if (beg_f > end_f) return mrb_fixnum_value(0); - f = end_f - beg_f; - if (!r->excl) { - return mrb_fixnum_value((mrb_int)ceil(f + 1)); + mrb_float n = end_f - beg_f; + mrb_float err = (fabs(beg_f) + fabs(end_f) + fabs(end_f-beg_f)) * DBL_EPSILON; + + if (err>0.5) err=0.5; + if (excl) { + if (n<=0) return mrb_fixnum_value(0); + if (n<1) + n = 0; + else + n = floor(n - err); + } + else { + if (n<0) return mrb_fixnum_value(0); + n = floor(n + err); } - return mrb_fixnum_value((mrb_int)ceil(f)); + if (isinf(n+1)) + return mrb_float_value(mrb, INFINITY); + return mrb_fixnum_value(n+1); } return mrb_nil_value(); } |