diff options
| -rw-r--r-- | mrbgems/mruby-math/test/math.rb | 119 | ||||
| -rw-r--r-- | src/string.c | 5 |
2 files changed, 116 insertions, 8 deletions
diff --git a/mrbgems/mruby-math/test/math.rb b/mrbgems/mruby-math/test/math.rb index 86a4fc12c..d2790e289 100644 --- a/mrbgems/mruby-math/test/math.rb +++ b/mrbgems/mruby-math/test/math.rb @@ -1,6 +1,14 @@ ## # Math Test +def assert_float_and_int(exp_ary, act_ary) + assert('assert_float_and_int') do + flo_exp, int_exp, flo_act, int_act = *exp_ary, *act_ary + assert_float(flo_exp, flo_act) + assert_operator(int_exp, :eql?, int_act) + end +end + assert('Math.sin 0') do assert_float(0, Math.sin(0)) end @@ -109,12 +117,6 @@ assert('Math.hypot') do assert_float(5.0, Math.hypot(3, 4)) end -assert('Math.frexp 1234') do - n = 1234 - fraction, exponent = Math.frexp(n) - assert_float(n, Math.ldexp(fraction, exponent)) -end - assert('Math.erf 1') do assert_float(0.842700792949715, Math.erf(1)) end @@ -130,3 +132,108 @@ end assert('Math.erfc -1') do assert_float(1.8427007929497148, Math.erfc(-1)) end + +assert('Math.acos') do + assert_float(0 * Math::PI / 4, Math.acos( 1.0)) + assert_float(1 * Math::PI / 4, Math.acos( 1.0 / Math.sqrt(2))) + assert_float(2 * Math::PI / 4, Math.acos( 0.0)) + assert_float(4 * Math::PI / 4, Math.acos(-1.0)) + assert_raise(Math::DomainError) { Math.acos(+1.1) } + assert_raise(Math::DomainError) { Math.acos(-1.1) } +end + +assert('Math.asin') do + assert_float( 0 * Math::PI / 4, Math.asin( 0.0)) + assert_float( 1 * Math::PI / 4, Math.asin( 1.0 / Math.sqrt(2))) + assert_float( 2 * Math::PI / 4, Math.asin( 1.0)) + assert_float(-2 * Math::PI / 4, Math.asin(-1.0)) + assert_raise(Math::DomainError) { Math.asin(+1.1) } + assert_raise(Math::DomainError) { Math.asin(-1.1) } + assert_raise(Math::DomainError) { Math.asin(2.0) } +end + +assert('Math.atan') do + assert_float( 0 * Math::PI / 4, Math.atan( 0.0)) + assert_float( 1 * Math::PI / 4, Math.atan( 1.0)) + assert_float( 2 * Math::PI / 4, Math.atan(1.0 / 0.0)) + assert_float(-1 * Math::PI / 4, Math.atan(-1.0)) +end + +assert('Math.cosh') do + assert_float(1, Math.cosh(0)) + assert_float((Math::E ** 1 + Math::E ** -1) / 2, Math.cosh(1)) + assert_float((Math::E ** 2 + Math::E ** -2) / 2, Math.cosh(2)) +end + +assert('Math.sinh') do + assert_float(0, Math.sinh(0)) + assert_float((Math::E ** 1 - Math::E ** -1) / 2, Math.sinh(1)) + assert_float((Math::E ** 2 - Math::E ** -2) / 2, Math.sinh(2)) +end + +assert('Math.tanh') do + assert_float(Math.sinh(0) / Math.cosh(0), Math.tanh(0)) + assert_float(Math.sinh(1) / Math.cosh(1), Math.tanh(1)) + assert_float(Math.sinh(2) / Math.cosh(2), Math.tanh(2)) + assert_float(+1.0, Math.tanh(+1000.0)) + assert_float(-1.0, Math.tanh(-1000.0)) +end + +assert('Math.acosh') do + assert_float(0, Math.acosh(1)) + assert_float(1, Math.acosh((Math::E ** 1 + Math::E ** -1) / 2)) + assert_float(2, Math.acosh((Math::E ** 2 + Math::E ** -2) / 2)) + assert_raise(Math::DomainError) { Math.acosh(0.9) } + assert_raise(Math::DomainError) { Math.acosh(0) } +end + +assert('Math.asinh') do + assert_float(0, Math.asinh(0)) + assert_float(1, Math.asinh((Math::E ** 1 - Math::E ** -1) / 2)) + assert_float(2, Math.asinh((Math::E ** 2 - Math::E ** -2) / 2)) +end + +assert('Math.atanh') do + assert_float(0, Math.atanh(Math.sinh(0) / Math.cosh(0))) + assert_float(1, Math.atanh(Math.sinh(1) / Math.cosh(1))) + assert_float(2, Math.atanh(Math.sinh(2) / Math.cosh(2))) + assert_float(Float::INFINITY, Math.atanh(1)) + assert_float(-Float::INFINITY, Math.atanh(-1)) + assert_raise(Math::DomainError) { Math.atanh(+1.1) } + assert_raise(Math::DomainError) { Math.atanh(-1.1) } +end + +assert('Math.atan2') do + assert_float(+0.0, Math.atan2(+0.0, +0.0)) + assert_float(-0.0, Math.atan2(-0.0, +0.0)) + assert_float(+Math::PI, Math.atan2(+0.0, -0.0)) + assert_float(-Math::PI, Math.atan2(-0.0, -0.0)) + + inf = Float::INFINITY + expected = 3.0 * Math::PI / 4.0 + assert_float(+expected, Math.atan2(+inf, -inf)) + assert_float(-expected, Math.atan2(-inf, -inf)) + expected = Math::PI / 4.0 + assert_float(+expected, Math.atan2(+inf, +inf)) + assert_float(-expected, Math.atan2(-inf, +inf)) + + assert_float(0, Math.atan2(0, 1)) + assert_float(Math::PI / 4, Math.atan2(1, 1)) + assert_float(Math::PI / 2, Math.atan2(1, 0)) +end + +assert('Math.ldexp') do + assert_float(0.0, Math.ldexp(0.0, 0.0)) + assert_float(0.5, Math.ldexp(0.5, 0.0)) + assert_float(1.0, Math.ldexp(0.5, 1.0)) + assert_float(2.0, Math.ldexp(0.5, 2.0)) + assert_float(3.0, Math.ldexp(0.75, 2.0)) +end + +assert('Math.frexp') do + assert_float_and_int([0.0, 0], Math.frexp(0.0)) + assert_float_and_int([0.5, 0], Math.frexp(0.5)) + assert_float_and_int([0.5, 1], Math.frexp(1.0)) + assert_float_and_int([0.5, 2], Math.frexp(2.0)) + assert_float_and_int([0.75, 2], Math.frexp(3.0)) +end diff --git a/src/string.c b/src/string.c index dcf338eab..61fbd4ded 100644 --- a/src/string.c +++ b/src/string.c @@ -2492,8 +2492,9 @@ mrb_str_to_i(mrb_state *mrb, mrb_value self) #ifndef MRB_WITHOUT_FLOAT MRB_API double -mrb_cstr_to_dbl(mrb_state *mrb, const char * p, mrb_bool badcheck) +mrb_cstr_to_dbl(mrb_state *mrb, const char * s, mrb_bool badcheck) { + const char *p = s; char *end; char buf[DBL_DIG * 4 + 10]; double d; @@ -2508,7 +2509,7 @@ mrb_cstr_to_dbl(mrb_state *mrb, const char * p, mrb_bool badcheck) if (p == end) { if (badcheck) { bad: - mrb_raisef(mrb, E_ARGUMENT_ERROR, "invalid string for float(%s)", p); + mrb_raisef(mrb, E_ARGUMENT_ERROR, "invalid string for float(%!s)", s); /* not reached */ } return d; |