mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-10 14:00:21 +02:00
Code Activity

(scm_num_eq_p, scm_less_p): Don't pass NaN to mpz_cmp_d.

Browse source
This commit is contained in:
Kevin Ryde 2003-05-09 23:14:35 +00:00
parent 9cb16d5ddf
commit 2b031f4f65
1 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

18
libguile/numbers.c
View file

@ -2520,12 +2520,15 @@ scm_num_eq_p (SCM x, SCM y)
scm_remember_upto_here_2 (x, y);
return SCM_BOOL (0 == cmp);
} else if (SCM_REALP (y)) {
int cmp = mpz_cmp_d (SCM_I_BIG_MPZ (x), SCM_REAL_VALUE (y));
int cmp;
if (xisnan (SCM_REAL_VALUE (y))) return SCM_BOOL_F;
cmp = mpz_cmp_d (SCM_I_BIG_MPZ (x), SCM_REAL_VALUE (y));
scm_remember_upto_here_1 (x);
return SCM_BOOL (0 == cmp);
} else if (SCM_COMPLEXP (y)) {
int cmp;
if (0.0 != SCM_COMPLEX_IMAG (y)) return SCM_BOOL_F;
if (xisnan (SCM_COMPLEX_REAL (y))) return SCM_BOOL_F;
cmp = mpz_cmp_d (SCM_I_BIG_MPZ (x), SCM_COMPLEX_REAL (y));
scm_remember_upto_here_1 (x);
return SCM_BOOL (0 == cmp);
@ -2536,7 +2539,9 @@ scm_num_eq_p (SCM x, SCM y)
if (SCM_INUMP (y)) {
return SCM_BOOL (SCM_REAL_VALUE (x) == (double) SCM_INUM (y));
} else if (SCM_BIGP (y)) {
int cmp = mpz_cmp_d (SCM_I_BIG_MPZ (y), SCM_REAL_VALUE (x));
int cmp;
if (xisnan (SCM_REAL_VALUE (x))) return SCM_BOOL_F;
cmp = mpz_cmp_d (SCM_I_BIG_MPZ (y), SCM_REAL_VALUE (x));
scm_remember_upto_here_1 (y);
return SCM_BOOL (0 == cmp);
} else if (SCM_REALP (y)) {
@ -2554,6 +2559,7 @@ scm_num_eq_p (SCM x, SCM y)
} else if (SCM_BIGP (y)) {
int cmp;
if (0.0 != SCM_COMPLEX_IMAG (x)) return SCM_BOOL_F;
if (xisnan (SCM_COMPLEX_REAL (x))) return SCM_BOOL_F;
cmp = mpz_cmp_d (SCM_I_BIG_MPZ (y), SCM_COMPLEX_REAL (x));
scm_remember_upto_here_1 (y);
return SCM_BOOL (0 == cmp);
@ -2603,7 +2609,9 @@ scm_less_p (SCM x, SCM y)
scm_remember_upto_here_2 (x, y);
return SCM_BOOL (cmp < 0);
} else if (SCM_REALP (y)) {
int cmp = mpz_cmp_d (SCM_I_BIG_MPZ (x), SCM_REAL_VALUE (y));
int cmp;
if (xisnan (SCM_REAL_VALUE (y))) return SCM_BOOL_F;
cmp = mpz_cmp_d (SCM_I_BIG_MPZ (x), SCM_REAL_VALUE (y));
scm_remember_upto_here_1 (x);
return SCM_BOOL (cmp < 0);
} else {
@ -2613,7 +2621,9 @@ scm_less_p (SCM x, SCM y)
if (SCM_INUMP (y)) {
return SCM_BOOL (SCM_REAL_VALUE (x) < (double) SCM_INUM (y));
} else if (SCM_BIGP (y)) {
int cmp = mpz_cmp_d (SCM_I_BIG_MPZ (y), SCM_REAL_VALUE (x));
int cmp;
if (xisnan (SCM_REAL_VALUE (x))) return SCM_BOOL_F;
cmp = mpz_cmp_d (SCM_I_BIG_MPZ (y), SCM_REAL_VALUE (x));
scm_remember_upto_here_1 (y);
return SCM_BOOL (cmp > 0);
} else if (SCM_REALP (y)) {