summaryrefslogtreecommitdiff
path: root/libguile/validate.h
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2018-06-18 10:23:04 +0200
committerAndy Wingo <wingo@pobox.com>2018-06-18 10:50:17 +0200
commit6f294ecc7522343be2774b18e2fe8e37ac58779c (patch)
treea564d7ff9c60443673167d6f8c913308a62f6c5b /libguile/validate.h
parent8a6f46ee96e0946e539e3a33c95c3228b63e9fb3 (diff)
downloadguile-6f294ecc7522343be2774b18e2fe8e37ac58779c.tar.gz
Devolve more validate macros
* libguile.h: Add chooks.h. * libguile/Makefile.am: Add chooks.h and chooks.c. * libguile/chooks.c: * libguile/chooks.h: New files, for the C implementation of hooks. Broken out to avoid cycles in gc.h includes. * libguile/gc.h: * libguile/gc.c (scm_i_gc_admin_mutex, scm_i_sweep_mutex): Remove unused mutexes. Include chooks instead of hooks in the main header. * libguile/deprecated.h (scm_gc_running_p): Deprecate this macro always defined to 0. (SCM_VALIDATE_VECTOR_OR_DVECTOR): Deprecate this weird one too. * libguile/array-map.c: Add procs.h include. * libguile/threads.h: * libguile/vm.c: * libguile/r6rs-ports.c: Add smob.h include. * libguile/atomic.h (SCM_VALIDATE_ATOMIC_BOX): Devolve. * libguile/deprecation.c (scm_c_issue_deprecation_warning): Remove use of scm_gc_running_p. * libguile/error.c (scm_error_scm): Remove use of scm_gc_running_p. * libguile/filesys.h (SCM_VALIDATE_DIR) * libguile/fluids.h (SCM_VALIDATE_FLUID) * libguile/fports.h (SCM_VALIDATE_FPORT, SCM_VALIDATE_OPFPORT) * libguile/generalized-arrays.h (SCM_VALIDATE_ARRAY) * libguile/hooks.h (SCM_VALIDATE_HOOK) * libguile/keywords.h (SCM_VALIDATE_KEYWORD) * libguile/ports.h (SCM_VALIDATE_PORT, SCM_VALIDATE_INPUT_PORT) (SCM_VALIDATE_OUTPUT_PORT, SCM_VALIDATE_OPINPORT) (SCM_VALIDATE_OPENPORT, SCM_VALIDATE_OPPORT, SCM_VALIDATE_OPOUTPORT) * libguile/procs.h (SCM_VALIDATE_PROC) * libguile/random.h (SCM_VALIDATE_RSTATE) * libguile/regex-posix.h (SCM_VALIDATE_RGXP) * libguile/stacks.h (SCM_VALIDATE_STACK, SCM_VALIDATE_FRAME) * libguile/strports.h (SCM_VALIDATE_OPOUTSTRPORT) * libguile/struct.h (SCM_VALIDATE_STRUCT SCM_VALIDATE_VTABLE) * libguile/symbols.h (SCM_VALIDATE_SYMBOL) * libguile/variable.h (SCM_VALIDATE_VARIABLE) * libguile/vectors.h (SCM_VALIDATE_VECTOR SCM_VALIDATE_VECTOR_LEN): Devolve. * libguile/validate.h: It's empty now! hooks squish
Diffstat (limited to 'libguile/validate.h')
-rw-r--r--libguile/validate.h102
1 files changed, 0 insertions, 102 deletions
diff --git a/libguile/validate.h b/libguile/validate.h
index 66aa38b28..39569209c 100644
--- a/libguile/validate.h
+++ b/libguile/validate.h
@@ -24,108 +24,6 @@
/* Written by Greg J. Badros <gjb@cs.washington.edu>, Dec-1999 */
-
-
-#include <libguile/error.h>
-
-
-
-
-#define SCM_VALIDATE_SYMBOL(pos, str) \
- do { \
- SCM_ASSERT_TYPE (scm_is_symbol (str), str, pos, FUNC_NAME, "symbol"); \
- } while (0)
-
-#define SCM_VALIDATE_VARIABLE(pos, var) SCM_MAKE_VALIDATE_MSG (pos, var, VARIABLEP, "variable")
-
-#define SCM_VALIDATE_ATOMIC_BOX(pos, var) \
- do { \
- SCM_ASSERT_TYPE (scm_is_atomic_box (var), var, pos, FUNC_NAME, \
- "atomic box"); \
- } while (0)
-
-#define SCM_VALIDATE_PROC(pos, proc) \
- do { \
- SCM_ASSERT (scm_is_true (scm_procedure_p (proc)), proc, pos, FUNC_NAME); \
- } while (0)
-
-#define SCM_VALIDATE_HOOK(pos, a) SCM_MAKE_VALIDATE_MSG (pos, a, HOOKP, "hook")
-
-#define SCM_VALIDATE_RGXP(pos, a) SCM_MAKE_VALIDATE_MSG (pos, a, RGXP, "regexp")
-
-#define SCM_VALIDATE_DIR(pos, port) SCM_MAKE_VALIDATE_MSG (pos, port, DIRP, "directory port")
-
-#define SCM_VALIDATE_PORT(pos, port) SCM_MAKE_VALIDATE_MSG (pos, port, PORTP, "port")
-
-#define SCM_VALIDATE_INPUT_PORT(pos, port) \
- SCM_MAKE_VALIDATE_MSG (pos, port, INPUT_PORT_P, "input port")
-
-#define SCM_VALIDATE_OUTPUT_PORT(pos, port) \
- SCM_MAKE_VALIDATE_MSG (pos, port, OUTPUT_PORT_P, "output port")
-
-#define SCM_VALIDATE_FPORT(pos, port) SCM_MAKE_VALIDATE_MSG (pos, port, FPORTP, "file port")
-
-#define SCM_VALIDATE_OPFPORT(pos, port) SCM_MAKE_VALIDATE_MSG (pos, port, OPFPORTP, "open file port")
-
-#define SCM_VALIDATE_OPINPORT(pos, port) \
- SCM_MAKE_VALIDATE_MSG (pos, port, OPINPORTP, "open input port")
-
-#define SCM_VALIDATE_OPENPORT(pos, port) \
- do { \
- SCM_ASSERT (SCM_PORTP (port) && SCM_OPENP (port), \
- port, pos, FUNC_NAME); \
- } while (0)
-
-#define SCM_VALIDATE_OPPORT(pos, port) SCM_MAKE_VALIDATE_MSG (pos, port, OPPORTP, "open port")
-
-#define SCM_VALIDATE_OPOUTPORT(pos, port) \
- SCM_MAKE_VALIDATE_MSG (pos, port, OPOUTPORTP, "open output port")
-
-#define SCM_VALIDATE_OPOUTSTRPORT(pos, port) \
- SCM_MAKE_VALIDATE_MSG (pos, port, OPOUTSTRPORTP, "open output string port")
-
-#define SCM_VALIDATE_FLUID(pos, fluid) \
- SCM_I_MAKE_VALIDATE_MSG2 (pos, fluid, scm_is_fluid, "fluid")
-
-#define SCM_VALIDATE_KEYWORD(pos, v) SCM_MAKE_VALIDATE_MSG (pos, v, KEYWORDP, "keyword")
-
-#define SCM_VALIDATE_STACK(pos, v) SCM_MAKE_VALIDATE_MSG (pos, v, STACKP, "stack")
-
-#define SCM_VALIDATE_FRAME(pos, v) SCM_MAKE_VALIDATE_MSG (pos, v, FRAMEP, "frame")
-
-#define SCM_VALIDATE_RSTATE(pos, v) SCM_MAKE_VALIDATE_MSG (pos, v, RSTATEP, "random-generator-state")
-
-#define SCM_VALIDATE_ARRAY(pos, v) \
- do { \
- SCM_ASSERT (SCM_HEAP_OBJECT_P (v) \
- && scm_is_true (scm_array_p (v, SCM_UNDEFINED)), \
- v, pos, FUNC_NAME); \
- } while (0)
-
-#define SCM_VALIDATE_VECTOR(pos, v) \
- do { \
- SCM_ASSERT (scm_is_vector (v), v, pos, FUNC_NAME); \
- } while (0)
-
-#define SCM_VALIDATE_VECTOR_OR_DVECTOR(pos, v) \
- do { \
- SCM_ASSERT (scm_is_vector (v) || scm_is_true (scm_f64vector_p (v)), \
- v, pos, FUNC_NAME); \
- } while (0)
-
-#define SCM_VALIDATE_STRUCT(pos, v) SCM_MAKE_VALIDATE_MSG (pos, v, STRUCTP, "struct")
-
-#define SCM_VALIDATE_VTABLE(pos, v) \
- do { \
- SCM_ASSERT (scm_is_true (scm_struct_vtable_p (v)), v, pos, FUNC_NAME); \
- } while (0)
-
-#define SCM_VALIDATE_VECTOR_LEN(pos, v, len) \
- do { \
- SCM_ASSERT (scm_is_vector (v) && len == scm_c_vector_length (v), v, pos, FUNC_NAME); \
- } while (0)
-
-
#endif /* SCM_VALIDATE_H */
/*