* numbers.h (SCM_INEXACTP, SCM_REALP, SCM_COMPLEXP): Removed uses

	of SCM_SLOPPY_INEXACTP, SCM_SLOPPY_REALP and SCM_SLOPPY_COMPLEXP.

	* numbers.h, deprecated.h (SCM_SLOPPY_INEXACTP, SCM_SLOPPY_REALP,
	SCM_SLOPPY_COMPLEXP): Deprecated and moved from numbers.h to
	deprecated.h.

diff --git a/NEWS b/NEWS
index e9adf4f..a0f3a9e 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -630,6 +630,18 @@ Guile always defines
 
   scm_t_timespec
 
+** The macro SCM_SLOPPY_INEXACTP has been deprecated.
+
+Use SCM_INEXACTP instead.
+
+** The macro SCM_SLOPPY_REALP has been deprecated.
+
+Use SCM_REALP instead.
+
+** The macro SCM_SLOPPY_COMPLEXP has been deprecated.
+
+Use SCM_COMPLEXP instead.
+
 ** The preprocessor define USE_THREADS has been deprecated.
 
 Going forward, assume that the thread API is always present.

diff --git a/libguile/ChangeLog b/libguile/ChangeLog
index 18d07d8..a00254d 100644 (file)
--- a/libguile/ChangeLog
+++ b/libguile/ChangeLog
@@ -1,3 +1,12 @@
+2003-09-06  Dirk Herrmann  <D.Herrmann@tu-bs.de>
+
+       * numbers.h (SCM_INEXACTP, SCM_REALP, SCM_COMPLEXP): Removed uses
+       of SCM_SLOPPY_INEXACTP, SCM_SLOPPY_REALP and SCM_SLOPPY_COMPLEXP.
+
+       * numbers.h, deprecated.h (SCM_SLOPPY_INEXACTP, SCM_SLOPPY_REALP,
+       SCM_SLOPPY_COMPLEXP): Deprecated and moved from numbers.h to
+       deprecated.h.
+
 2003-09-06  Dirk Herrmann  <D.Herrmann@tu-bs.de>
 
        * eq.c (scm_eqv_p, scm_equal_p): Removed uses of

diff --git a/libguile/deprecated.h b/libguile/deprecated.h
index ec0901d..c16ad93 100644 (file)
--- a/libguile/deprecated.h
+++ b/libguile/deprecated.h
@@ -27,6 +27,13 @@
 
 #if (SCM_ENABLE_DEPRECATED == 1)
 
+/* From numbers.h: Macros checking for types, but avoiding a redundant check
+ * for !SCM_IMP.  These were deprecated in guile 1.7.0 on 2003-09-06.  */
+#define SCM_SLOPPY_INEXACTP(x) (SCM_TYP16S (x) == scm_tc16_real)
+#define SCM_SLOPPY_REALP(x) (SCM_TYP16 (x) == scm_tc16_real)
+#define SCM_SLOPPY_COMPLEXP(x) (SCM_TYP16 (x) == scm_tc16_complex)
+
+
 /* From eval.h: Macros for handling ilocs.  These were deprecated in guile
  * 1.7.0 on 2003-06-04.  */
 #define SCM_ILOC00             SCM_MAKE_ITAG8(0L, scm_tc8_iloc)

diff --git a/libguile/numbers.h b/libguile/numbers.h
index c46bfe8..4172c70 100644 (file)
--- a/libguile/numbers.h
+++ b/libguile/numbers.h
@@ -121,12 +121,9 @@
 /* Numbers 
  */
 
-#define SCM_SLOPPY_INEXACTP(x) (SCM_TYP16S (x) == scm_tc16_real)
-#define SCM_SLOPPY_REALP(x) (SCM_TYP16 (x) == scm_tc16_real)
-#define SCM_SLOPPY_COMPLEXP(x) (SCM_TYP16 (x) == scm_tc16_complex)
-#define SCM_INEXACTP(x) (!SCM_IMP (x) && SCM_SLOPPY_INEXACTP(x))
-#define SCM_REALP(x) (!SCM_IMP (x) && SCM_SLOPPY_REALP(x))
-#define SCM_COMPLEXP(x) (!SCM_IMP (x) && SCM_SLOPPY_COMPLEXP(x))
+#define SCM_INEXACTP(x) (!SCM_IMP (x) && SCM_TYP16S (x) == scm_tc16_real)
+#define SCM_REALP(x) (!SCM_IMP (x) && SCM_TYP16 (x) == scm_tc16_real)
+#define SCM_COMPLEXP(x) (!SCM_IMP (x) && SCM_TYP16 (x) == scm_tc16_complex)
 
 #define SCM_REAL_VALUE(x) (((scm_t_double *) SCM2PTR (x))->real)
 #define SCM_COMPLEX_MEM(x) ((scm_t_complex *) SCM_CELL_WORD_1 (x))