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/srcprop.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/srcprop.c')
-rw-r--r-- | libguile/srcprop.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libguile/srcprop.c b/libguile/srcprop.c index 7cd37ad39..a21acc049 100644 --- a/libguile/srcprop.c +++ b/libguile/srcprop.c @@ -261,7 +261,7 @@ GUILE_PROC (scm_set_source_property_x, "set-source-property!", 3, 0, 0, if (scm_sym_breakpoint == key) { if (SCM_FALSEP (datum)) - CLEARSRCPROPBRK (SCM_NIMP (p) && SRCPROPSP (p) + CLEARSRCPROPBRK (SRCPROPSP (p) ? p : SCM_WHASHSET (scm_source_whash, h, scm_make_srcprops (0, @@ -270,7 +270,7 @@ GUILE_PROC (scm_set_source_property_x, "set-source-property!", 3, 0, 0, SCM_UNDEFINED, p))); else - SETSRCPROPBRK (SCM_NIMP (p) && SRCPROPSP (p) + SETSRCPROPBRK (SRCPROPSP (p) ? p : SCM_WHASHSET (scm_source_whash, h, scm_make_srcprops (0, @@ -282,7 +282,7 @@ GUILE_PROC (scm_set_source_property_x, "set-source-property!", 3, 0, 0, else if (scm_sym_line == key) { SCM_VALIDATE_INT(3,datum); - if (SCM_NIMP (p) && SRCPROPSP (p)) + if (SRCPROPSP (p)) SETSRCPROPLINE (p, SCM_INUM (datum)); else SCM_WHASHSET (scm_source_whash, h, @@ -292,7 +292,7 @@ GUILE_PROC (scm_set_source_property_x, "set-source-property!", 3, 0, 0, else if (scm_sym_column == key) { SCM_VALIDATE_INT(3,datum); - if (SCM_NIMP (p) && SRCPROPSP (p)) + if (SRCPROPSP (p)) SETSRCPROPCOL (p, SCM_INUM (datum)); else SCM_WHASHSET (scm_source_whash, h, @@ -301,14 +301,14 @@ GUILE_PROC (scm_set_source_property_x, "set-source-property!", 3, 0, 0, } else if (scm_sym_filename == key) { - if (SCM_NIMP (p) && SRCPROPSP (p)) + if (SRCPROPSP (p)) SRCPROPFNAME (p) = datum; else SCM_WHASHSET (scm_source_whash, h, scm_make_srcprops (0, 0, datum, SCM_UNDEFINED, p)); } else if (scm_sym_filename == key) { - if (SCM_NIMP (p) && SRCPROPSP (p)) + if (SRCPROPSP (p)) SRCPROPCOPY (p) = datum; else SCM_WHASHSET (scm_source_whash, h, scm_make_srcprops (0, 0, SCM_UNDEFINED, datum, p)); |