summaryrefslogtreecommitdiff
path: root/libguile/error.c
diff options
context:
space:
mode:
authorDirk Herrmann <dirk@dirk-herrmanns-seiten.de>2001-03-17 13:34:21 +0000
committerDirk Herrmann <dirk@dirk-herrmanns-seiten.de>2001-03-17 13:34:21 +0000
commitb3fcac341bca85278d1694d09e2d3207edb5ab94 (patch)
tree9ffd590ab04035fbe899a84195452548fdd0edf7 /libguile/error.c
parent68baa7e7f8088e21eaa3d0b568a985528314ada5 (diff)
downloadguile-b3fcac341bca85278d1694d09e2d3207edb5ab94.tar.gz
* __scm.h (SCM_ASSERT, SCM_WTA_DISPATCH_0, SCM_WTA_DISPATCH_1,
SCM_WTA_DISPATCH_2, SCM_WTA_DISPATCH_n): Don't call scm_wta, call scm_wrong_type_arg instead. (SCM_WNA): Deprecated. * error.[ch] (scm_wta): Deprecated. * numbers.c (s_i_log): Minor comment fix. * read.c (scm_lreadr), unif.c (scm_aind, scm_shap2ra, scm_make_shared_array, scm_transpose_array, scm_enclose_array, scm_array_in_bounds_p): Don't use SCM_ASSERT to check for wrong-num-args or misc errors. * unif.c (scm_make_shared_array, scm_transpose_array, scm_enclose_array, scm_array_in_bounds_p, scm_array_set_x): Validate the rest argument (note: this is only done when guile is built with SCM_DEBUG_REST_ARGUMENT=1) (scm_array_in_bounds_p, scm_uniform_vector_ref, scm_array_set_x): Replace calls to scm_wrong_num_args by SCM_WRONG_NUM_ARGS. * validate.h (SCM_FUNC_NAME, SCM_VALIDATE_NUMBER_COPY, SCM_VALIDATE_NUMBER_DEF_COPY): Deprecated.
Diffstat (limited to 'libguile/error.c')
-rw-r--r--libguile/error.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/libguile/error.c b/libguile/error.c
index 7d8b30900..9073e2afe 100644
--- a/libguile/error.c
+++ b/libguile/error.c
@@ -314,7 +314,8 @@ scm_misc_error (const char *subr, const char *message, SCM args)
scm_error (scm_misc_error_key, subr, message, args, SCM_BOOL_F);
}
-/* implements the SCM_ASSERT interface. */
+#if (SCM_DEBUG_DEPRECATED == 0)
+
SCM
scm_wta (SCM arg, const char *pos, const char *s_subr)
{
@@ -350,16 +351,10 @@ 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);
@@ -368,6 +363,8 @@ scm_wta (SCM arg, const char *pos, const char *s_subr)
return SCM_UNSPECIFIED;
}
+#endif /* SCM_DEBUG_DEPRECATED == 0 */
+
void
scm_init_error ()
{