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/objects.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/objects.c')
-rw-r--r-- | libguile/objects.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libguile/objects.c b/libguile/objects.c index b6b9e0d9d..80478facf 100644 --- a/libguile/objects.c +++ b/libguile/objects.c @@ -364,7 +364,7 @@ GUILE_PROC (scm_entity_p, "entity?", 1, 0, 0, "") #define FUNC_NAME s_scm_entity_p { - return SCM_BOOL(SCM_NIMP (obj) && SCM_STRUCTP (obj) && SCM_I_ENTITYP (obj)); + return SCM_BOOL(SCM_STRUCTP (obj) && SCM_I_ENTITYP (obj)); } #undef FUNC_NAME @@ -385,7 +385,7 @@ GUILE_PROC (scm_set_object_procedure_x, "set-object-procedure!", 2, 0, 0, "") #define FUNC_NAME s_scm_set_object_procedure_x { - SCM_ASSERT (SCM_NIMP (obj) && SCM_STRUCTP (obj) + SCM_ASSERT (SCM_STRUCTP (obj) && ((SCM_CLASS_FLAGS (obj) & SCM_CLASSF_OPERATOR) || (SCM_I_ENTITYP (obj) && !(SCM_OBJ_CLASS_FLAGS (obj) @@ -408,7 +408,7 @@ GUILE_PROC (scm_object_procedure, "object-procedure", 1, 0, 0, "") #define FUNC_NAME s_scm_object_procedure { - SCM_ASSERT (SCM_NIMP (obj) && SCM_STRUCTP (obj) + SCM_ASSERT (SCM_STRUCTP (obj) && ((SCM_CLASS_FLAGS (obj) & SCM_CLASSF_OPERATOR) || SCM_I_ENTITYP (obj)), obj, SCM_ARG1, FUNC_NAME); |