This is the mail archive of the
guile@sourceware.cygnus.com
mailing list for the Guile project.
More SCM_NIMP patches.
- To: Guile Mailing List <guile at sourceware dot cygnus dot com>
- Subject: More SCM_NIMP patches.
- From: Dirk Herrmann <dirk at ida dot ing dot tu-bs dot de>
- Date: Mon, 3 Jan 2000 14:45:59 +0100 (MET)
Happy new year.
This one starts with another set of patches that remove calls to SCM_NIMP
which have become unnecessary thanks to Greg's long discussed patches.
Best regards
Dirk Herrmann
===================================================================
RCS file: /cvs/guile/guile/guile-core/libguile/eval.c,v
retrieving revision 1.126
diff -u -p -r1.126 eval.c
--- eval.c 1999/12/18 03:19:06 1.126
+++ eval.c 2000/01/03 13:41:40
@@ -547,7 +547,7 @@ scm_m_set_x (SCM xorig, SCM env)
{
SCM x = SCM_CDR (xorig);
SCM_ASSYNT (2 == scm_ilength (x), xorig, scm_s_expression, scm_s_set_x);
- SCM_ASSYNT (SCM_NIMP (SCM_CAR (x)) && SCM_SYMBOLP (SCM_CAR (x)),
+ SCM_ASSYNT (SCM_SYMBOLP (SCM_CAR (x)),
xorig, scm_s_variable, scm_s_set_x);
return scm_cons (SCM_IM_SET_X, x);
}
@@ -3407,8 +3407,7 @@ tail:
else
{
SCM tl = args = scm_cons (SCM_CAR (arg1), SCM_UNSPECIFIED);
- while (SCM_NIMP (arg1 = SCM_CDR (arg1))
- && SCM_CONSP (arg1))
+ while (arg1 = SCM_CDR (arg1), SCM_CONSP (arg1))
{
SCM_SETCDR (tl, scm_cons (SCM_CAR (arg1),
SCM_UNSPECIFIED));
@@ -3773,7 +3772,7 @@ any other object.")
ans = tl = scm_cons_source (obj,
scm_copy_tree (SCM_CAR (obj)),
SCM_UNSPECIFIED);
- while (SCM_NIMP (obj = SCM_CDR (obj)) && SCM_CONSP (obj))
+ while (obj = SCM_CDR (obj), SCM_CONSP (obj))
{
SCM_SETCDR (tl, scm_cons (scm_copy_tree (SCM_CAR (obj)),
SCM_UNSPECIFIED));