mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-06-19 02:00:26 +02:00
* 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.
This commit is contained in:
parent
9c24ff3e6c
commit
0c95b57d77
50 changed files with 324 additions and 384 deletions
|
@ -197,7 +197,7 @@ recsexpr (SCM obj,int line,int column,SCM filename)
|
|||
{
|
||||
copy = scm_cons (recsexpr (SCM_CAR (obj), line, column, filename),
|
||||
SCM_UNDEFINED);
|
||||
while (SCM_NIMP (tmp = SCM_CDR (tmp)) && SCM_CONSP (tmp))
|
||||
while ((tmp = SCM_CDR (tmp)) && SCM_CONSP (tmp))
|
||||
{
|
||||
SCM_SETCDR (copy, scm_cons (recsexpr (SCM_CAR (tmp),
|
||||
line,
|
||||
|
@ -211,7 +211,7 @@ recsexpr (SCM obj,int line,int column,SCM filename)
|
|||
else
|
||||
{
|
||||
recsexpr (SCM_CAR (obj), line, column, filename);
|
||||
while (SCM_NIMP (tmp = SCM_CDR (tmp)) && SCM_CONSP (tmp))
|
||||
while ((tmp = SCM_CDR (tmp)) && SCM_CONSP (tmp))
|
||||
recsexpr (SCM_CAR (tmp), line, column, filename);
|
||||
copy = SCM_UNDEFINED;
|
||||
}
|
||||
|
@ -657,7 +657,7 @@ scm_lreadrecparen (SCM *tok_buf, SCM port, char *name, SCM *copy)
|
|||
/* Build the head of the list structure. */
|
||||
ans = tl = scm_cons (tmp, SCM_EOL);
|
||||
if (SCM_COPY_SOURCE_P)
|
||||
ans2 = tl2 = scm_cons (SCM_NIMP (tmp) && SCM_CONSP (tmp)
|
||||
ans2 = tl2 = scm_cons (SCM_CONSP (tmp)
|
||||
? *copy
|
||||
: tmp,
|
||||
SCM_EOL);
|
||||
|
@ -668,7 +668,7 @@ scm_lreadrecparen (SCM *tok_buf, SCM port, char *name, SCM *copy)
|
|||
{
|
||||
SCM_SETCDR (tl, tmp = scm_lreadr (tok_buf, port, copy));
|
||||
if (SCM_COPY_SOURCE_P)
|
||||
SCM_SETCDR (tl2, scm_cons (SCM_NIMP (tmp) && SCM_CONSP (tmp)
|
||||
SCM_SETCDR (tl2, scm_cons (SCM_CONSP (tmp)
|
||||
? *copy
|
||||
: tmp,
|
||||
SCM_EOL));
|
||||
|
@ -678,7 +678,7 @@ scm_lreadrecparen (SCM *tok_buf, SCM port, char *name, SCM *copy)
|
|||
}
|
||||
tl = SCM_SETCDR (tl, scm_cons (tmp, SCM_EOL));
|
||||
if (SCM_COPY_SOURCE_P)
|
||||
tl2 = SCM_SETCDR (tl2, scm_cons (SCM_NIMP (tmp) && SCM_CONSP (tmp)
|
||||
tl2 = SCM_SETCDR (tl2, scm_cons (SCM_CONSP (tmp)
|
||||
? *copy
|
||||
: tmp,
|
||||
SCM_EOL));
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue