summaryrefslogtreecommitdiff
path: root/libguile/scm_validate.h
diff options
context:
space:
mode:
authorGreg J. Badros <gjb@cs.washington.edu>1999-12-12 18:30:09 +0000
committerGreg J. Badros <gjb@cs.washington.edu>1999-12-12 18:30:09 +0000
commit6b5a304f6b006beeb6088d5002c7574e874b28e3 (patch)
treee8c4739bb0e2e1cb7ccf7b7a5a024d36258073a6 /libguile/scm_validate.h
parent5bff3127b542b14a9f881af0b68d61e21712d9c8 (diff)
downloadguile-6b5a304f6b006beeb6088d5002c7574e874b28e3.tar.gz
* *.c, scm_validate.h: Use SCM_VALIDATE_NIM, not SCM_VALIDATE_NIMP
(none of the other validate macros have the trailing P).
Diffstat (limited to 'libguile/scm_validate.h')
-rw-r--r--libguile/scm_validate.h10
1 files changed, 8 insertions, 2 deletions
diff --git a/libguile/scm_validate.h b/libguile/scm_validate.h
index eab2e3d16..4c6d3ebac 100644
--- a/libguile/scm_validate.h
+++ b/libguile/scm_validate.h
@@ -1,4 +1,4 @@
-/* $Id: scm_validate.h,v 1.2 1999-12-12 18:08:24 gjb Exp $ */
+/* $Id: scm_validate.h,v 1.3 1999-12-12 18:30:09 gjb Exp $ */
/* Copyright (C) 1999 Free Software Foundation, Inc.
*
* This program is free software; you can redistribute it and/or modify
@@ -88,9 +88,15 @@
#define SCM_MUST_MALLOC(size) (scm_must_malloc((size), FUNC_NAME))
-#define SCM_VALIDATE_NIMP(pos,scm) \
+#define SCM_VALIDATE_NIM (pos,scm) \
do { SCM_ASSERT(SCM_NIMP(scm), scm, pos, FUNC_NAME); } while (0)
+#define SCM_MAKE_NIM_VALIDATE(pos,var,pred) \
+ do { SCM_ASSERT (SCM_NIMP(var) && SCM ## pred(var), var, pos, FUNC_NAME); } while (0)
+
+#define SCM_MAKE_VALIDATE(pos,var,pred) \
+ do { SCM_ASSERT (SCM ## pred(var), var, pos, FUNC_NAME); } while (0)
+
#define SCM_VALIDATE_BOOL(pos,flag) \
do { SCM_ASSERT(SCM_BOOL_T == flag || SCM_BOOL_F == flag, flag, pos, FUNC_NAME); } while (0)