diff options
author | Greg J. Badros <gjb@cs.washington.edu> | 1999-12-16 20:48:05 +0000 |
---|---|---|
committer | Greg J. Badros <gjb@cs.washington.edu> | 1999-12-16 20:48:05 +0000 |
commit | 0c95b57d77efbe82bb0ade78df5d78d6d0f2a641 (patch) | |
tree | 4cd49dc6b94effdaed1476f397dc7c82d371b008 /libguile/throw.c | |
parent | 9c24ff3e6c28e7b9adc6b386ea0033e8a947c40e (diff) | |
download | guile-0c95b57d77efbe82bb0ade78df5d78d6d0f2a641.tar.gz |
* coop-threads.c: Remove K&R function headers.
* scm_validate.h: Added SCM_VALIDATE_THREAD.
* *.c: Remove SCM_NIMP(X) when it is an extraneous pre-test given
that SCM_FOOP macros all now include SCM_NIMP in their expansion.
This simplifies lots of code, making it far more readable.
Diffstat (limited to 'libguile/throw.c')
-rw-r--r-- | libguile/throw.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libguile/throw.c b/libguile/throw.c index 59e4ad9d6..8b0c3676d 100644 --- a/libguile/throw.c +++ b/libguile/throw.c @@ -551,7 +551,7 @@ this call to @code{catch}.") { struct scm_body_thunk_data c; - SCM_ASSERT ((SCM_NIMP(tag) && SCM_SYMBOLP(tag)) || tag == SCM_BOOL_T, + SCM_ASSERT (SCM_SYMBOLP(tag) || tag == SCM_BOOL_T, tag, SCM_ARG1, FUNC_NAME); c.tag = tag; @@ -576,8 +576,7 @@ GUILE_PROC(scm_lazy_catch, "lazy-catch", 3, 0, 0, { struct scm_body_thunk_data c; - SCM_ASSERT ((SCM_NIMP(tag) && SCM_SYMBOLP(tag)) - || (tag == SCM_BOOL_T), + SCM_ASSERT (SCM_SYMBOLP(tag) || (tag == SCM_BOOL_T), tag, SCM_ARG1, FUNC_NAME); c.tag = tag; @@ -634,7 +633,7 @@ scm_ithrow (SCM key, SCM args, int noreturn) abort (); dynpair = SCM_CAR (winds); - if (SCM_NIMP (dynpair) && SCM_CONSP (dynpair)) + if (SCM_CONSP (dynpair)) { SCM this_key = SCM_CAR (dynpair); |