From b63a956dc50aa3234ccda2c5c6bcda4d9e41acbc Mon Sep 17 00:00:00 2001
From: Dirk Herrmann <dirk@dirk-herrmanns-seiten.de>
Date: Fri, 30 Jun 2000 17:37:26 +0000
Subject: [PATCH] * Re-introduced some symbols as deprecated.

---
 NEWS               |  8 ++++++++
 RELEASE            |  7 +++++++
 libguile/ChangeLog | 11 +++++++++++
 libguile/__scm.h   | 22 ++++++++++++++++++++++
 libguile/error.c   | 10 ++++++++++
 5 files changed, 58 insertions(+)

diff --git a/NEWS b/NEWS
index 062bb1430..5c3a2189e 100644
--- a/NEWS
+++ b/NEWS
@@ -55,6 +55,14 @@ Example:
 
 * Changes to the scm_ interface
 
+** Deprecated macros:  SCM_OUTOFRANGE, SCM_NALLOC, SCM_HUP_SIGNAL, 
+SCM_INT_SIGNAL, SCM_FPE_SIGNAL, SCM_BUS_SIGNAL, SCM_SEGV_SIGNAL, 
+SCM_ALRM_SIGNAL, SCM_GC_SIGNAL, SCM_TICK_SIGNAL, SCM_SIG_ORD, 
+SCM_ORD_SIG, SCM_NUM_SIGS
+
+Use SCM_ASSERT_RANGE or SCM_VALIDATE_XXX_RANGE instead of SCM_OUTOFRANGE.
+Use scm_memory_error instead of SCM_NALLOC.
+
 
 Changes since Guile 1.3.4:
 
diff --git a/RELEASE b/RELEASE
index 13d47924e..9921ed806 100644
--- a/RELEASE
+++ b/RELEASE
@@ -33,6 +33,13 @@ In release 1.5:
   SCM_UNEGFIXABLE, SCM_FLOBUFLEN, SCM_INEXP, SCM_CPLXP, SCM_REAL, SCM_IMAG,
   SCM_REALPART, scm_makdbl, SCM_SINGP, SCM_NUM2DBL, SCM_NO_BIGDIG
 
+In release 1.6:
+- remove deprecated macros: SCM_OUTOFRANGE, SCM_NALLOC, SCM_HUP_SIGNAL, 
+  SCM_INT_SIGNAL, SCM_FPE_SIGNAL, SCM_BUS_SIGNAL, SCM_SEGV_SIGNAL, 
+  SCM_ALRM_SIGNAL, SCM_GC_SIGNAL, SCM_TICK_SIGNAL, SCM_SIG_ORD, 
+  SCM_ORD_SIG, SCM_NUM_SIGS
+
+
 Modules sort.c and random.c should be factored out into separate
 modules (but still be distributed with guile-core) when we get a new
 module system.
diff --git a/libguile/ChangeLog b/libguile/ChangeLog
index 9a5d5982d..2d8b96768 100644
--- a/libguile/ChangeLog
+++ b/libguile/ChangeLog
@@ -1,3 +1,14 @@
+2000-06-30  Dirk Herrmann  <D.Herrmann@tu-bs.de>
+
+	* __scm.h (SCM_OUTOFRANGE, SCM_NALLOC, SCM_HUP_SIGNAL,
+	SCM_INT_SIGNAL, SCM_FPE_SIGNAL, SCM_BUS_SIGNAL, SCM_SEGV_SIGNAL,
+	SCM_ALRM_SIGNAL, SCM_GC_SIGNAL, SCM_TICK_SIGNAL, SCM_SIG_ORD,
+	SCM_ORD_SIG, SCM_NUM_SIGS):  Re-introduce these as deprecated
+	symbols.
+
+	* error.c (scm_wta):  Re-introduce dispatching for SCM_OUTOFRANGE
+	and SCM_NALLOC, but as a deprecated feature.
+
 2000-06-30  Mikael Djurfeldt  <mdj@thalamus.nada.kth.se>
 
 	* debug.c: Added #include fluids.h.
diff --git a/libguile/__scm.h b/libguile/__scm.h
index f1aa50afb..2146ca9ac 100644
--- a/libguile/__scm.h
+++ b/libguile/__scm.h
@@ -555,6 +555,28 @@ extern SCM scm_apply_generic (SCM gf, SCM args);
  */
 #define SCM_WNA 		8
 
+#if (SCM_DEBUG_DEPRECATED == 0)
+
+/* Use SCM_ASSERT_RANGE or SCM_VALIDATE_XXX_RANGE instead of: */
+#define SCM_OUTOFRANGE         10
+
+/* Use scm_memory_error instead of: */
+#define SCM_NALLOC             11
+
+#define SCM_HUP_SIGNAL         14
+#define SCM_INT_SIGNAL         15
+#define SCM_FPE_SIGNAL         16
+#define SCM_BUS_SIGNAL         17
+#define SCM_SEGV_SIGNAL        18
+#define SCM_ALRM_SIGNAL        19
+#define SCM_GC_SIGNAL          20
+#define SCM_TICK_SIGNAL        21
+#define SCM_SIG_ORD(X)         ((X) - SCM_HUP_SIGNAL)
+#define SCM_ORD_SIG(X)         ((X) + SCM_HUP_SIGNAL)
+#define SCM_NUM_SIGS           (SCM_SIG_ORD (SCM_TICK_SIGNAL) + 1)
+
+#endif  /* SCM_DEBUG_DEPRECATED == 0 */
+
 #endif /* SCM_MAGIC_SNARFER */
 
 
diff --git a/libguile/error.c b/libguile/error.c
index 067b3cdb1..850bf5b7d 100644
--- a/libguile/error.c
+++ b/libguile/error.c
@@ -316,6 +316,16 @@ scm_wta (SCM arg, const char *pos, const char *s_subr)
 	  scm_wrong_type_arg (s_subr, 7, arg);
 	case SCM_WNA:
 	  scm_wrong_num_args (arg);
+
+#if (SCM_DEBUG_DEPRECATED == 0)
+
+	case SCM_OUTOFRANGE:
+	  scm_out_of_range (s_subr, arg);
+	case SCM_NALLOC:
+	  scm_memory_error (s_subr);
+
+#endif  /* SCM_DEBUG_DEPRECATED == 0 */
+
 	default:
 	  /* this shouldn't happen.  */
 	  scm_misc_error (s_subr, "Unknown error", SCM_EOL);