diff options
author | Dirk Herrmann <dirk@dirk-herrmanns-seiten.de> | 2003-09-04 20:14:02 +0000 |
---|---|---|
committer | Dirk Herrmann <dirk@dirk-herrmanns-seiten.de> | 2003-09-04 20:14:02 +0000 |
commit | 3ea39242b84a4b29fa85ed1d876468287fae3007 (patch) | |
tree | aaef30edc70ab75e68848678df75d68b1d6d5c58 /libguile/unif.c | |
parent | 5d7d39ff5d54f9c2191d19bff64bb4ab8d458228 (diff) | |
download | guile-3ea39242b84a4b29fa85ed1d876468287fae3007.tar.gz |
* unit.c (scm_cvref): Eliminate unnecessary uses of SCM_NIMP,
SCM_SLOPPY_REALP and SCM_SLOPPY_COMPLEXP.
Diffstat (limited to 'libguile/unif.c')
-rw-r--r-- | libguile/unif.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libguile/unif.c b/libguile/unif.c index 8b77b4a1e..7fc950f20 100644 --- a/libguile/unif.c +++ b/libguile/unif.c @@ -1184,21 +1184,21 @@ scm_cvref (SCM v, unsigned long pos, SCM last) return scm_long_long2num (((long long *) SCM_CELL_WORD_1 (v))[pos]); #endif case scm_tc7_fvect: - if (SCM_NIMP (last) && !SCM_EQ_P (last, scm_flo0) && SCM_SLOPPY_REALP (last)) + if (SCM_REALP (last) && !SCM_EQ_P (last, scm_flo0)) { SCM_REAL_VALUE (last) = ((float *) SCM_CELL_WORD_1 (v))[pos]; return last; } return scm_make_real (((float *) SCM_CELL_WORD_1 (v))[pos]); case scm_tc7_dvect: - if (SCM_NIMP (last) && !SCM_EQ_P (last, scm_flo0) && SCM_SLOPPY_REALP (last)) + if (SCM_REALP (last) && !SCM_EQ_P (last, scm_flo0)) { SCM_REAL_VALUE (last) = ((double *) SCM_CELL_WORD_1 (v))[pos]; return last; } return scm_make_real (((double *) SCM_CELL_WORD_1 (v))[pos]); case scm_tc7_cvect: - if (SCM_NIMP (last) && SCM_SLOPPY_COMPLEXP (last)) + if (SCM_COMPLEXP (last)) { SCM_COMPLEX_REAL (last) = ((double *) SCM_CELL_WORD_1 (v))[2 * pos]; SCM_COMPLEX_IMAG (last) = ((double *) SCM_CELL_WORD_1 (v))[2 * pos + 1]; |