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/procprop.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/procprop.c')
-rw-r--r-- | libguile/procprop.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libguile/procprop.c b/libguile/procprop.c index fd5242c64..e18acdc15 100644 --- a/libguile/procprop.c +++ b/libguile/procprop.c @@ -116,7 +116,7 @@ scm_i_procedure_arity (SCM proc) proc = SCM_CAR (SCM_CODE (proc)); if (SCM_IMP (proc)) break; - while (SCM_NIMP (proc) && SCM_CONSP (proc)) + while (SCM_CONSP (proc)) { ++a; proc = SCM_CDR (proc); @@ -169,7 +169,7 @@ GUILE_PROC(scm_procedure_properties, "procedure-properties", 1, 0, 0, { SCM_VALIDATE_PROC(1,proc); return scm_acons (scm_sym_arity, scm_i_procedure_arity (proc), - SCM_PROCPROPS (SCM_NIMP (proc) && SCM_CLOSUREP (proc) + SCM_PROCPROPS (SCM_CLOSUREP (proc) ? proc : scm_stand_in_scm_proc (proc))); } @@ -180,7 +180,7 @@ GUILE_PROC(scm_set_procedure_properties_x, "set-procedure-properties!", 2, 0, 0, "Set @var{obj}'s property list to @var{alist}.") #define FUNC_NAME s_scm_set_procedure_properties_x { - if (!(SCM_NIMP (proc) && SCM_CLOSUREP (proc))) + if (!SCM_CLOSUREP (proc)) proc = scm_stand_in_scm_proc(proc); SCM_VALIDATE_CLOSURE(1,proc); SCM_SETPROCPROPS (proc, new_val); @@ -203,7 +203,7 @@ GUILE_PROC(scm_procedure_property, "procedure-property", 2, 0, 0, } SCM_VALIDATE_PROC(1,p); assoc = scm_sloppy_assq (k, - SCM_PROCPROPS (SCM_NIMP (p) && SCM_CLOSUREP (p) + SCM_PROCPROPS (SCM_CLOSUREP (p) ? p : scm_stand_in_scm_proc (p))); return (SCM_NIMP (assoc) ? SCM_CDR (assoc) : SCM_BOOL_F); @@ -217,7 +217,7 @@ GUILE_PROC(scm_set_procedure_property_x, "set-procedure-property!", 3, 0, 0, #define FUNC_NAME s_scm_set_procedure_property_x { SCM assoc; - if (!(SCM_NIMP (p) && SCM_CLOSUREP (p))) + if (!SCM_CLOSUREP (p)) p = scm_stand_in_scm_proc(p); SCM_VALIDATE_CLOSURE(1,p); if (k == scm_sym_arity) |