diff options
| author | ksss <[email protected]> | 2016-11-19 09:29:22 +0900 |
|---|---|---|
| committer | ksss <[email protected]> | 2016-11-19 23:25:07 +0900 |
| commit | a2fbd80a473071f76687dda5fda7dbbea7efde9f (patch) | |
| tree | 0b97738d88d0a32747231f1ecd02729084a1200f | |
| parent | 1685eff2a5e672173d67916a1c96648df92b7271 (diff) | |
| download | mruby-a2fbd80a473071f76687dda5fda7dbbea7efde9f.tar.gz mruby-a2fbd80a473071f76687dda5fda7dbbea7efde9f.zip | |
Fix Range#size results
| -rw-r--r-- | mrbgems/mruby-range-ext/src/range.c | 27 | ||||
| -rw-r--r-- | mrbgems/mruby-range-ext/test/range.rb | 2 |
2 files changed, 22 insertions, 7 deletions
diff --git a/mrbgems/mruby-range-ext/src/range.c b/mrbgems/mruby-range-ext/src/range.c index 4d6f1684f..87bdab228 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) @@ -140,9 +141,11 @@ mrb_range_size(mrb_state *mrb, mrb_value range) mrb_value beg, end; double 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); } @@ -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)); + double n = end_f - beg_f; + double 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(); } diff --git a/mrbgems/mruby-range-ext/test/range.rb b/mrbgems/mruby-range-ext/test/range.rb index 18e7dafe4..ea1e12f2e 100644 --- a/mrbgems/mruby-range-ext/test/range.rb +++ b/mrbgems/mruby-range-ext/test/range.rb @@ -25,5 +25,7 @@ assert('Range#size') do assert_equal 6, (1...6.3).size assert_equal 5, (1...6.0).size assert_equal 5, (1.1...6).size + assert_equal 15, (1.0..15.9).size + assert_equal Float::INFINITY, (0..Float::INFINITY).size assert_nil ('a'..'z').size end |