diff options
| -rw-r--r-- | mrbgems/mruby-time/src/time.c | 15 | ||||
| -rw-r--r-- | src/numeric.c | 12 | ||||
| -rw-r--r-- | test/t/float.rb | 3 |
3 files changed, 18 insertions, 12 deletions
diff --git a/mrbgems/mruby-time/src/time.c b/mrbgems/mruby-time/src/time.c index 7e5f68f43..908fe77f8 100644 --- a/mrbgems/mruby-time/src/time.c +++ b/mrbgems/mruby-time/src/time.c @@ -211,16 +211,7 @@ mrb_time_wrap(mrb_state *mrb, struct RClass *tc, struct mrb_time *tm) return mrb_obj_value(Data_Wrap_Struct(mrb, tc, &mrb_time_type, tm)); } -static void -check_num_exact(mrb_state *mrb, double num) -{ - if (isinf(num)) { - mrb_raise(mrb, E_FLOATDOMAIN_ERROR, num < 0 ? "-Infinity" : "Infinity"); - } - if (isnan(num)) { - mrb_raise(mrb, E_FLOATDOMAIN_ERROR, "NaN"); - } -} +void mrb_check_num_exact(mrb_state *mrb, mrb_float num); /* Allocates a mrb_time object and initializes it. */ static struct mrb_time* @@ -229,8 +220,8 @@ time_alloc(mrb_state *mrb, double sec, double usec, enum mrb_timezone timezone) struct mrb_time *tm; time_t tsec = 0; - check_num_exact(mrb, sec); - check_num_exact(mrb, usec); + mrb_check_num_exact(mrb, (mrb_float)sec); + mrb_check_num_exact(mrb, (mrb_float)usec); if (sizeof(time_t) == 4 && (sec > (double)INT32_MAX || (double)INT32_MIN > sec)) { goto out_of_range; diff --git a/src/numeric.c b/src/numeric.c index 828898fcc..aa6f86cb9 100644 --- a/src/numeric.c +++ b/src/numeric.c @@ -610,6 +610,17 @@ flo_round(mrb_state *mrb, mrb_value num) return mrb_fixnum_value((mrb_int)number); } +void +mrb_check_num_exact(mrb_state *mrb, mrb_float num) +{ + if (isinf(num)) { + mrb_raise(mrb, E_FLOATDOMAIN_ERROR, num < 0 ? "-Infinity" : "Infinity"); + } + if (isnan(num)) { + mrb_raise(mrb, E_FLOATDOMAIN_ERROR, "NaN"); + } +} + /* 15.2.9.3.14 */ /* 15.2.9.3.15 */ /* @@ -630,6 +641,7 @@ flo_truncate(mrb_state *mrb, mrb_value num) if (f < 0.0) f = ceil(f); if (!FIXABLE(f)) { + mrb_check_num_exact(mrb, f); return mrb_float_value(mrb, f); } return mrb_fixnum_value((mrb_int)f); diff --git a/test/t/float.rb b/test/t/float.rb index 1805c6e7d..7e8c98988 100644 --- a/test/t/float.rb +++ b/test/t/float.rb @@ -148,6 +148,9 @@ end assert('Float#to_i', '15.2.9.3.14') do assert_equal(3, 3.123456789.to_i) + assert_raise(FloatDomainError) { Float::INFINITY.to_i } + assert_raise(FloatDomainError) { (-Float::INFINITY).to_i } + assert_raise(FloatDomainError) { Float::NAN.to_i } end assert('Float#truncate', '15.2.9.3.15') do |