1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* math.c (domain_check): should not raise EDOM exception for NaN

value if operand is also NaN.  affects acos, asin, acosh, atanh,
  log, log2, log10, sqrt, gamma, lgamma. [ruby-dev:37357]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@20619 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2008-12-10 18:00:51 +00:00
parent 3266ec1658
commit 54a722bd42
2 changed files with 49 additions and 32 deletions

View file

@ -1,3 +1,9 @@
Thu Dec 11 02:37:22 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* math.c (domain_check): should not raise EDOM exception for NaN
value if operand is also NaN. affects acos, asin, acosh, atanh,
log, log2, log10, sqrt, gamma, lgamma. [ruby-dev:37357]
Thu Dec 11 02:23:51 2008 Tanaka Akira <akr@fsij.org> Thu Dec 11 02:23:51 2008 Tanaka Akira <akr@fsij.org>
* lib/open3.rb (Open3.pipeline_start): return an array of threads if a * lib/open3.rb (Open3.pipeline_start): return an array of threads if a

75
math.c
View file

@ -35,13 +35,14 @@ to_flo(VALUE x)
} while (0) } while (0)
static void static void
domain_check(double x, const char *msg) domain_check(double x, double y, const char *msg)
{ {
while(1) { while(1) {
if (errno) { if (errno) {
rb_sys_fail(msg); rb_sys_fail(msg);
} }
if (isnan(x)) { if (isnan(y)) {
if (isnan(x)) break;
#if defined(EDOM) #if defined(EDOM)
errno = EDOM; errno = EDOM;
#elif defined(ERANGE) #elif defined(ERANGE)
@ -146,12 +147,13 @@ math_tan(VALUE obj, VALUE x)
static VALUE static VALUE
math_acos(VALUE obj, VALUE x) math_acos(VALUE obj, VALUE x)
{ {
double d; double d0, d;
Need_Float(x); Need_Float(x);
errno = 0; errno = 0;
d = acos(RFLOAT_VALUE(x)); d0 = RFLOAT_VALUE(x);
domain_check(d, "acos"); d = acos(d0);
domain_check(d0, d, "acos");
return DBL2NUM(d); return DBL2NUM(d);
} }
@ -165,12 +167,13 @@ math_acos(VALUE obj, VALUE x)
static VALUE static VALUE
math_asin(VALUE obj, VALUE x) math_asin(VALUE obj, VALUE x)
{ {
double d; double d0, d;
Need_Float(x); Need_Float(x);
errno = 0; errno = 0;
d = asin(RFLOAT_VALUE(x)); d0 = RFLOAT_VALUE(x);
domain_check(d, "asin"); d = asin(d0);
domain_check(d0, d, "asin");
return DBL2NUM(d); return DBL2NUM(d);
} }
@ -267,12 +270,13 @@ math_tanh(VALUE obj, VALUE x)
static VALUE static VALUE
math_acosh(VALUE obj, VALUE x) math_acosh(VALUE obj, VALUE x)
{ {
double d; double d0, d;
Need_Float(x); Need_Float(x);
errno = 0; errno = 0;
d = acosh(RFLOAT_VALUE(x)); d0 = RFLOAT_VALUE(x);
domain_check(d, "acosh"); d = acosh(d0);
domain_check(d0, d, "acosh");
return DBL2NUM(d); return DBL2NUM(d);
} }
@ -300,12 +304,13 @@ math_asinh(VALUE obj, VALUE x)
static VALUE static VALUE
math_atanh(VALUE obj, VALUE x) math_atanh(VALUE obj, VALUE x)
{ {
double d; double d0, d;
Need_Float(x); Need_Float(x);
errno = 0; errno = 0;
d = atanh(RFLOAT_VALUE(x)); d0 = RFLOAT_VALUE(x);
domain_check(d, "atanh"); d = atanh(d0);
domain_check(d0, d, "atanh");
infinity_check(x, d, "atanh"); infinity_check(x, d, "atanh");
return DBL2NUM(d); return DBL2NUM(d);
} }
@ -347,17 +352,18 @@ static VALUE
math_log(int argc, VALUE *argv) math_log(int argc, VALUE *argv)
{ {
VALUE x, base; VALUE x, base;
double d; double d0, d;
rb_scan_args(argc, argv, "11", &x, &base); rb_scan_args(argc, argv, "11", &x, &base);
Need_Float(x); Need_Float(x);
errno = 0; errno = 0;
d = log(RFLOAT_VALUE(x)); d0 = RFLOAT_VALUE(x);
d = log(d0);
if (argc == 2) { if (argc == 2) {
Need_Float(base); Need_Float(base);
d /= log(RFLOAT_VALUE(base)); d /= log(RFLOAT_VALUE(base));
} }
domain_check(d, "log"); domain_check(d0, d, "log");
infinity_check(x, d, "log"); infinity_check(x, d, "log");
return DBL2NUM(d); return DBL2NUM(d);
} }
@ -384,12 +390,13 @@ extern double log2(double);
static VALUE static VALUE
math_log2(VALUE obj, VALUE x) math_log2(VALUE obj, VALUE x)
{ {
double d; double d0, d;
Need_Float(x); Need_Float(x);
errno = 0; errno = 0;
d = log2(RFLOAT_VALUE(x)); d0 = RFLOAT_VALUE(x);
domain_check(d, "log2"); d = log2(d0);
domain_check(d0, d, "log2");
infinity_check(x, d, "log2"); infinity_check(x, d, "log2");
return DBL2NUM(d); return DBL2NUM(d);
} }
@ -404,12 +411,13 @@ math_log2(VALUE obj, VALUE x)
static VALUE static VALUE
math_log10(VALUE obj, VALUE x) math_log10(VALUE obj, VALUE x)
{ {
double d; double d0, d;
Need_Float(x); Need_Float(x);
errno = 0; errno = 0;
d = log10(RFLOAT_VALUE(x)); d0 = RFLOAT_VALUE(x);
domain_check(d, "log10"); d = log10(d0);
domain_check(d0, d, "log10");
infinity_check(x, d, "log10"); infinity_check(x, d, "log10");
return DBL2NUM(d); return DBL2NUM(d);
} }
@ -441,12 +449,13 @@ math_log10(VALUE obj, VALUE x)
static VALUE static VALUE
math_sqrt(VALUE obj, VALUE x) math_sqrt(VALUE obj, VALUE x)
{ {
double d; double d0, d;
Need_Float(x); Need_Float(x);
errno = 0; errno = 0;
d = sqrt(RFLOAT_VALUE(x)); d0 = RFLOAT_VALUE(x);
domain_check(d, "sqrt"); d = sqrt(d0);
domain_check(d0, d, "sqrt");
return DBL2NUM(d); return DBL2NUM(d);
} }
@ -619,11 +628,12 @@ math_erfc(VALUE obj, VALUE x)
static VALUE static VALUE
math_gamma(VALUE obj, VALUE x) math_gamma(VALUE obj, VALUE x)
{ {
double d; double d0, d;
Need_Float(x); Need_Float(x);
errno = 0; errno = 0;
d = tgamma(RFLOAT_VALUE(x)); d0 = RFLOAT_VALUE(x);
domain_check(d, "gamma"); d = tgamma(d0);
domain_check(d0, d, "gamma");
return DBL2NUM(d); return DBL2NUM(d);
} }
@ -642,13 +652,14 @@ math_gamma(VALUE obj, VALUE x)
static VALUE static VALUE
math_lgamma(VALUE obj, VALUE x) math_lgamma(VALUE obj, VALUE x)
{ {
double d; double d0, d;
int sign; int sign;
VALUE v; VALUE v;
Need_Float(x); Need_Float(x);
errno = 0; errno = 0;
d = lgamma_r(RFLOAT_VALUE(x), &sign); d0 = RFLOAT_VALUE(x);
domain_check(d, "lgamma"); d = lgamma_r(d0, &sign);
domain_check(d0, d, "lgamma");
v = DBL2NUM(d); v = DBL2NUM(d);
return rb_assoc_new(v, INT2FIX(sign)); return rb_assoc_new(v, INT2FIX(sign));
} }