mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-02 04:40:29 +02:00
Code Activity

(scm_inexact_to_exact): Don't depend on what double->long

Browse source 
cast gives for values bigger than a long, or for nan or inf.
This commit is contained in:
Kevin Ryde 2003-10-09 00:38:51 +00:00
parent f09fe63732
commit 2be24db4d7
1 changed files with 19 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

26
libguile/numbers.c
View file

@ -4337,14 +4337,26 @@ SCM_DEFINE (scm_inexact_to_exact, "inexact->exact", 1, 0, 0,
return z; return z;
else if (SCM_REALP (z)) else if (SCM_REALP (z))
{ {
double u = floor (SCM_REAL_VALUE (z) + 0.5); /* SCM_MOST_POSITIVE_FIXNUM+1 and SCM_MOST_NEGATIVE_FIXNUM are both
long lu = (long) u; powers of 2, so there's no rounding when making "double" values
if (SCM_FIXABLE (lu)) from them. If plain SCM_MOST_POSITIVE_FIXNUM was used it could get
return SCM_MAKINUM (lu); rounded on a 64-bit machine, hence the "+1".
else if (!xisinf (u) && !xisnan (u))
return scm_i_dbl2big (u); The use of floor() to force to an integer value ensures we get a
else "numerically closest" value without depending on how a double->long
cast or how mpz_set_d will round. For reference, double->long
probably follows the hardware rounding mode, mpz_set_d truncates
towards zero. */
double u = SCM_REAL_VALUE (z);
if (xisinf (u) || xisnan (u))
scm_num_overflow (s_scm_inexact_to_exact); scm_num_overflow (s_scm_inexact_to_exact);
u = floor (u + 0.5);
if (u < (double) (SCM_MOST_POSITIVE_FIXNUM+1)
&& u >= (double) SCM_MOST_NEGATIVE_FIXNUM)
return SCM_MAKINUM ((long) u);
else
return scm_i_dbl2big (u);
} }
else else
SCM_WRONG_TYPE_ARG (1, z); SCM_WRONG_TYPE_ARG (1, z);