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

math.c: Get_Double

Browse source 
* math.c (Get_Double): direct casting from Fixnum to double.
  [Feature #10785]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49433 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2015-01-29 01:41:54 +00:00
parent 6ce27adabe
commit d77ae2c2f4
2 changed files with 33 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Thu Jan 29 10:41:52 2015 gogotanaka <mail@tanakakazuki.com>
* math.c (Get_Double): direct casting from Fixnum to double.
[Feature #10785]
Thu Jan 29 02:34:27 2015 Aaron Patterson <aaron@tenderlovemaking.com> Thu Jan 29 02:34:27 2015 Aaron Patterson <aaron@tenderlovemaking.com>
* ext/psych/lib/psych/visitors/to_ruby.rb: fix parsing hashes with * ext/psych/lib/psych/visitors/to_ruby.rb: fix parsing hashes with

87
math.c
View file

@ -24,11 +24,7 @@
VALUE rb_mMath; VALUE rb_mMath;
VALUE rb_eMathDomainError; VALUE rb_eMathDomainError;
#define Need_Float(x) do {if (!RB_TYPE_P(x, T_FLOAT)) {(x) = rb_to_float(x);}} while(0) #define Get_Double(x) FIXNUM_P(x) ? (double)FIX2LONG(x) : NUM2DBL(x)
#define Need_Float2(x,y) do {\
Need_Float(x);\
Need_Float(y);\
} while (0)
#define domain_error(msg) \ #define domain_error(msg) \
rb_raise(rb_eMathDomainError, "Numerical argument is out of domain - " #msg) rb_raise(rb_eMathDomainError, "Numerical argument is out of domain - " #msg)
@ -70,9 +66,8 @@ math_atan2(VALUE obj, VALUE y, VALUE x)
# define M_PI 3.14159265358979323846 # define M_PI 3.14159265358979323846
#endif #endif
double dx, dy; double dx, dy;
Need_Float2(y, x); dx = Get_Double(x);
dx = RFLOAT_VALUE(x); dy = Get_Double(y);
dy = RFLOAT_VALUE(y);
if (dx == 0.0 && dy == 0.0) { if (dx == 0.0 && dy == 0.0) {
if (!signbit(dx)) if (!signbit(dx))
return DBL2NUM(dy); return DBL2NUM(dy);
@ -115,8 +110,7 @@ math_atan2(VALUE obj, VALUE y, VALUE x)
static VALUE static VALUE
math_cos(VALUE obj, VALUE x) math_cos(VALUE obj, VALUE x)
{ {
Need_Float(x); return DBL2NUM(cos(Get_Double(x)));
return DBL2NUM(cos(RFLOAT_VALUE(x)));
} }
/* /*
@ -137,8 +131,7 @@ math_cos(VALUE obj, VALUE x)
static VALUE static VALUE
math_sin(VALUE obj, VALUE x) math_sin(VALUE obj, VALUE x)
{ {
Need_Float(x); return DBL2NUM(sin(Get_Double(x)));
return DBL2NUM(sin(RFLOAT_VALUE(x)));
} }
@ -159,8 +152,7 @@ math_sin(VALUE obj, VALUE x)
static VALUE static VALUE
math_tan(VALUE obj, VALUE x) math_tan(VALUE obj, VALUE x)
{ {
Need_Float(x); return DBL2NUM(tan(Get_Double(x)));
return DBL2NUM(tan(RFLOAT_VALUE(x)));
} }
/* /*
@ -182,8 +174,7 @@ math_acos(VALUE obj, VALUE x)
{ {
double d0, d; double d0, d;
Need_Float(x); d0 = Get_Double(x);
d0 = RFLOAT_VALUE(x);
/* check for domain error */ /* check for domain error */
if (d0 < -1.0 || 1.0 < d0) domain_error("acos"); if (d0 < -1.0 || 1.0 < d0) domain_error("acos");
d = acos(d0); d = acos(d0);
@ -208,8 +199,7 @@ math_asin(VALUE obj, VALUE x)
{ {
double d0, d; double d0, d;
Need_Float(x); d0 = Get_Double(x);
d0 = RFLOAT_VALUE(x);
/* check for domain error */ /* check for domain error */
if (d0 < -1.0 || 1.0 < d0) domain_error("asin"); if (d0 < -1.0 || 1.0 < d0) domain_error("asin");
d = asin(d0); d = asin(d0);
@ -232,8 +222,7 @@ math_asin(VALUE obj, VALUE x)
static VALUE static VALUE
math_atan(VALUE obj, VALUE x) math_atan(VALUE obj, VALUE x)
{ {
Need_Float(x); return DBL2NUM(atan(Get_Double(x)));
return DBL2NUM(atan(RFLOAT_VALUE(x)));
} }
#ifndef HAVE_COSH #ifndef HAVE_COSH
@ -261,8 +250,7 @@ cosh(double x)
static VALUE static VALUE
math_cosh(VALUE obj, VALUE x) math_cosh(VALUE obj, VALUE x)
{ {
Need_Float(x); return DBL2NUM(cosh(Get_Double(x)));
return DBL2NUM(cosh(RFLOAT_VALUE(x)));
} }
#ifndef HAVE_SINH #ifndef HAVE_SINH
@ -290,8 +278,7 @@ sinh(double x)
static VALUE static VALUE
math_sinh(VALUE obj, VALUE x) math_sinh(VALUE obj, VALUE x)
{ {
Need_Float(x); return DBL2NUM(sinh(Get_Double(x)));
return DBL2NUM(sinh(RFLOAT_VALUE(x)));
} }
#ifndef HAVE_TANH #ifndef HAVE_TANH
@ -319,8 +306,7 @@ tanh(double x)
static VALUE static VALUE
math_tanh(VALUE obj, VALUE x) math_tanh(VALUE obj, VALUE x)
{ {
Need_Float(x); return DBL2NUM(tanh(Get_Double(x)));
return DBL2NUM(tanh(RFLOAT_VALUE(x)));
} }
/* /*
@ -342,8 +328,7 @@ math_acosh(VALUE obj, VALUE x)
{ {
double d0, d; double d0, d;
Need_Float(x); d0 = Get_Double(x);
d0 = RFLOAT_VALUE(x);
/* check for domain error */ /* check for domain error */
if (d0 < 1.0) domain_error("acosh"); if (d0 < 1.0) domain_error("acosh");
d = acosh(d0); d = acosh(d0);
@ -367,8 +352,7 @@ math_acosh(VALUE obj, VALUE x)
static VALUE static VALUE
math_asinh(VALUE obj, VALUE x) math_asinh(VALUE obj, VALUE x)
{ {
Need_Float(x); return DBL2NUM(asinh(Get_Double(x)));
return DBL2NUM(asinh(RFLOAT_VALUE(x)));
} }
/* /*
@ -390,8 +374,7 @@ math_atanh(VALUE obj, VALUE x)
{ {
double d0, d; double d0, d;
Need_Float(x); d0 = Get_Double(x);
d0 = RFLOAT_VALUE(x);
/* check for domain error */ /* check for domain error */
if (d0 < -1.0 || +1.0 < d0) domain_error("atanh"); if (d0 < -1.0 || +1.0 < d0) domain_error("atanh");
/* check for pole error */ /* check for pole error */
@ -420,8 +403,7 @@ math_atanh(VALUE obj, VALUE x)
static VALUE static VALUE
math_exp(VALUE obj, VALUE x) math_exp(VALUE obj, VALUE x)
{ {
Need_Float(x); return DBL2NUM(exp(Get_Double(x)));
return DBL2NUM(exp(RFLOAT_VALUE(x)));
} }
#if defined __CYGWIN__ #if defined __CYGWIN__
@ -485,8 +467,7 @@ math_log1(VALUE x)
numbits = 0; numbits = 0;
} }
Need_Float(x); d0 = Get_Double(x);
d0 = RFLOAT_VALUE(x);
/* check for domain error */ /* check for domain error */
if (d0 < 0.0) domain_error("log"); if (d0 < 0.0) domain_error("log");
/* check for pole error */ /* check for pole error */
@ -541,8 +522,7 @@ math_log2(VALUE obj, VALUE x)
numbits = 0; numbits = 0;
} }
Need_Float(x); d0 = Get_Double(x);
d0 = RFLOAT_VALUE(x);
/* check for domain error */ /* check for domain error */
if (d0 < 0.0) domain_error("log2"); if (d0 < 0.0) domain_error("log2");
/* check for pole error */ /* check for pole error */
@ -583,8 +563,7 @@ math_log10(VALUE obj, VALUE x)
numbits = 0; numbits = 0;
} }
Need_Float(x); d0 = Get_Double(x);
d0 = RFLOAT_VALUE(x);
/* check for domain error */ /* check for domain error */
if (d0 < 0.0) domain_error("log10"); if (d0 < 0.0) domain_error("log10");
/* check for pole error */ /* check for pole error */
@ -626,8 +605,7 @@ math_sqrt(VALUE obj, VALUE x)
{ {
double d0, d; double d0, d;
Need_Float(x); d0 = Get_Double(x);
d0 = RFLOAT_VALUE(x);
/* check for domain error */ /* check for domain error */
if (d0 < 0.0) domain_error("sqrt"); if (d0 < 0.0) domain_error("sqrt");
if (d0 == 0.0) return DBL2NUM(0.0); if (d0 == 0.0) return DBL2NUM(0.0);
@ -673,8 +651,7 @@ math_sqrt(VALUE obj, VALUE x)
static VALUE static VALUE
math_cbrt(VALUE obj, VALUE x) math_cbrt(VALUE obj, VALUE x)
{ {
Need_Float(x); return DBL2NUM(cbrt(Get_Double(x)));
return DBL2NUM(cbrt(RFLOAT_VALUE(x)));
} }
/* /*
@ -694,9 +671,7 @@ math_frexp(VALUE obj, VALUE x)
double d; double d;
int exp; int exp;
Need_Float(x); d = frexp(Get_Double(x), &exp);
d = frexp(RFLOAT_VALUE(x), &exp);
return rb_assoc_new(DBL2NUM(d), INT2NUM(exp)); return rb_assoc_new(DBL2NUM(d), INT2NUM(exp));
} }
@ -713,8 +688,7 @@ math_frexp(VALUE obj, VALUE x)
static VALUE static VALUE
math_ldexp(VALUE obj, VALUE x, VALUE n) math_ldexp(VALUE obj, VALUE x, VALUE n)
{ {
Need_Float(x); return DBL2NUM(ldexp(Get_Double(x), NUM2INT(n)));
return DBL2NUM(ldexp(RFLOAT_VALUE(x), NUM2INT(n)));
} }
/* /*
@ -730,8 +704,7 @@ math_ldexp(VALUE obj, VALUE x, VALUE n)
static VALUE static VALUE
math_hypot(VALUE obj, VALUE x, VALUE y) math_hypot(VALUE obj, VALUE x, VALUE y)
{ {
Need_Float2(x, y); return DBL2NUM(hypot(Get_Double(x), Get_Double(y)));
return DBL2NUM(hypot(RFLOAT_VALUE(x), RFLOAT_VALUE(y)));
} }
/* /*
@ -751,8 +724,7 @@ math_hypot(VALUE obj, VALUE x, VALUE y)
static VALUE static VALUE
math_erf(VALUE obj, VALUE x) math_erf(VALUE obj, VALUE x)
{ {
Need_Float(x); return DBL2NUM(erf(Get_Double(x)));
return DBL2NUM(erf(RFLOAT_VALUE(x)));
} }
/* /*
@ -772,8 +744,7 @@ math_erf(VALUE obj, VALUE x)
static VALUE static VALUE
math_erfc(VALUE obj, VALUE x) math_erfc(VALUE obj, VALUE x)
{ {
Need_Float(x); return DBL2NUM(erfc(Get_Double(x)));
return DBL2NUM(erfc(RFLOAT_VALUE(x)));
} }
/* /*
@ -849,8 +820,7 @@ math_gamma(VALUE obj, VALUE x)
}; };
double d0, d; double d0, d;
double intpart, fracpart; double intpart, fracpart;
Need_Float(x); d0 = Get_Double(x);
d0 = RFLOAT_VALUE(x);
/* check for domain error */ /* check for domain error */
if (isinf(d0) && signbit(d0)) domain_error("gamma"); if (isinf(d0) && signbit(d0)) domain_error("gamma");
fracpart = modf(d0, &intpart); fracpart = modf(d0, &intpart);
@ -885,8 +855,7 @@ math_lgamma(VALUE obj, VALUE x)
double d0, d; double d0, d;
int sign=1; int sign=1;
VALUE v; VALUE v;
Need_Float(x); d0 = Get_Double(x);
d0 = RFLOAT_VALUE(x);
/* check for domain error */ /* check for domain error */
if (isinf(d0)) { if (isinf(d0)) {
if (signbit(d0)) domain_error("lgamma"); if (signbit(d0)) domain_error("lgamma");