diff options
Diffstat (limited to 'libguile')
-rw-r--r-- | libguile/ChangeLog | 7 | ||||
-rw-r--r-- | libguile/list.c | 2 | ||||
-rw-r--r-- | libguile/ramap.c | 10 | ||||
-rw-r--r-- | libguile/unif.c | 4 |
4 files changed, 15 insertions, 8 deletions
diff --git a/libguile/ChangeLog b/libguile/ChangeLog index 791af93e7..ee0d68831 100644 --- a/libguile/ChangeLog +++ b/libguile/ChangeLog @@ -1,5 +1,12 @@ 2003-04-21 Dirk Herrmann <D.Herrmann@tu-bs.de> + * list.c (scm_cons_star), ramap.c (scm_ra_sum, scm_ra_product, + scm_array_map_x), unif.c (l2ra): Prefer !SCM_NULLP over + SCM_NNULLP. Now, guile itself does not include any calls to + SCM_NNULLP any more. + +2003-04-21 Dirk Herrmann <D.Herrmann@tu-bs.de> + * eval.c (unmemocopy, SCM_APPLY, scm_map, scm_for_each, scm_copy_tree): Place assignment expressions which are part of other expressions into an expression of their own. diff --git a/libguile/list.c b/libguile/list.c index c2b50ae3d..a081f097b 100644 --- a/libguile/list.c +++ b/libguile/list.c @@ -123,7 +123,7 @@ SCM_DEFINE (scm_cons_star, "cons*", 1, 0, 1, if (!SCM_NULLP (rest)) { SCM prev = arg = scm_cons (arg, rest); - while (SCM_NNULLP (SCM_CDR (rest))) + while (!SCM_NULLP (SCM_CDR (rest))) { prev = rest; rest = SCM_CDR (rest); diff --git a/libguile/ramap.c b/libguile/ramap.c index bc67b4dac..47ef69eb3 100644 --- a/libguile/ramap.c +++ b/libguile/ramap.c @@ -981,7 +981,7 @@ scm_ra_sum (SCM ra0, SCM ras) unsigned long i0 = SCM_ARRAY_BASE (ra0); long inc0 = SCM_ARRAY_DIMS (ra0)->inc; ra0 = SCM_ARRAY_V (ra0); - if (SCM_NNULLP(ras)) + if (!SCM_NULLP(ras)) { SCM ra1 = SCM_CAR (ras); unsigned long i1 = SCM_ARRAY_BASE (ra1); @@ -1076,7 +1076,7 @@ scm_ra_product (SCM ra0, SCM ras) unsigned long i0 = SCM_ARRAY_BASE (ra0); long inc0 = SCM_ARRAY_DIMS (ra0)->inc; ra0 = SCM_ARRAY_V (ra0); - if (SCM_NNULLP (ras)) + if (!SCM_NULLP (ras)) { SCM ra1 = SCM_CAR (ras); unsigned long i1 = SCM_ARRAY_BASE (ra1); @@ -1528,14 +1528,14 @@ SCM_DEFINE (scm_array_map_x, "array-map!", 2, 0, 1, for (p = ra_rpsubrs; p->name; p++) if (SCM_EQ_P (proc, p->sproc)) { - while (SCM_NNULLP (lra) && SCM_NNULLP (SCM_CDR (lra))) + while (!SCM_NULLP (lra) && !SCM_NULLP (SCM_CDR (lra))) { scm_ramapc (p->vproc, SCM_UNDEFINED, ra0, lra, FUNC_NAME); lra = SCM_CDR (lra); } return SCM_UNSPECIFIED; } - while (SCM_NNULLP (lra) && SCM_NNULLP (SCM_CDR (lra))) + while (!SCM_NULLP (lra) && !SCM_NULLP (SCM_CDR (lra))) { scm_ramapc (ramap_rp, proc, ra0, lra, FUNC_NAME); lra = SCM_CDR (lra); @@ -1568,7 +1568,7 @@ SCM_DEFINE (scm_array_map_x, "array-map!", 2, 0, 1, if (!SCM_EQ_P (ra0, ra1) || (SCM_ARRAYP(ra0) && !SCM_ARRAY_CONTP(ra0))) goto gencase; - for (tail = SCM_CDR (lra); SCM_NNULLP (tail); tail = SCM_CDR (tail)) + for (tail = SCM_CDR (lra); !SCM_NULLP (tail); tail = SCM_CDR (tail)) { ra1 = SCM_CAR (tail); if (SCM_EQ_P (v0, ra1) diff --git a/libguile/unif.c b/libguile/unif.c index a11a49d50..79e16a0b1 100644 --- a/libguile/unif.c +++ b/libguile/unif.c @@ -2221,7 +2221,7 @@ l2ra (SCM lst, SCM ra, unsigned long base, unsigned long k) base += inc; lst = SCM_CDR (lst); } - if (SCM_NNULLP (lst)) + if (!SCM_NULLP (lst)) return 0; } else @@ -2234,7 +2234,7 @@ l2ra (SCM lst, SCM ra, unsigned long base, unsigned long k) base += inc; lst = SCM_CDR (lst); } - if (SCM_NNULLP (lst)) + if (!SCM_NULLP (lst)) return 0; } return ok; |