summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikael Djurfeldt <djurfeldt@nada.kth.se>1997-03-06 00:57:11 +0000
committerMikael Djurfeldt <djurfeldt@nada.kth.se>1997-03-06 00:57:11 +0000
commitee4274a65420e4321832e4f40cef34d32ff7d0fc (patch)
treef0acf0bca9e5a749edf867616554e7ac93a0d48f
parentb2530d665af0e518bbd3136d7f0ff001653a7a6a (diff)
downloadguile-ee4274a65420e4321832e4f40cef34d32ff7d0fc.tar.gz
* tags.h, eval.c (iqq): Fixes to comments about SCM_ECONSP.
-rw-r--r--libguile/ChangeLog4
-rw-r--r--libguile/eval.c1
-rw-r--r--libguile/tags.h5
3 files changed, 6 insertions, 4 deletions
diff --git a/libguile/ChangeLog b/libguile/ChangeLog
index 799c6d08b..d568520c7 100644
--- a/libguile/ChangeLog
+++ b/libguile/ChangeLog
@@ -1,3 +1,7 @@
+Thu Mar 6 00:53:02 1997 Mikael Djurfeldt <mdj@mdj.nada.kth.se>
+
+ * tags.h, eval.c (iqq): Fixes to comments about SCM_ECONSP.
+
Wed Mar 5 23:31:21 1997 Mikael Djurfeldt <mdj@mdj.nada.kth.se>
* tags.h (SCM_ECONSP, SCM_NECONSP): Bugfix: Discriminate structs
diff --git a/libguile/eval.c b/libguile/eval.c
index bf4c9a3d4..564e49edf 100644
--- a/libguile/eval.c
+++ b/libguile/eval.c
@@ -674,7 +674,6 @@ iqq (form, env, depth)
--depth;
label:
form = SCM_CDR (form);
- /* !!! might need a check here to be sure that form isn't a struct. */
SCM_ASSERT (SCM_NIMP (form) && SCM_ECONSP (form) && SCM_NULLP (SCM_CDR (form)),
form, SCM_ARG1, s_quasiquote);
if (0 == depth)
diff --git a/libguile/tags.h b/libguile/tags.h
index 0e65fb7e4..72610f7e0 100644
--- a/libguile/tags.h
+++ b/libguile/tags.h
@@ -275,9 +275,8 @@ typedef long SCM;
#define SCM_CONSP(x) (!SCM_NCONSP(x))
-/* ECONSP is historical and, in fact, slightly buggy.
- * There are two places to fix where structures and glocs can be confused.
- * !!!
+/* SCM_ECONSP should be used instead of SCM_CONSP at places where GLOCS
+ * can be expected to occur.
*/
#define SCM_ECONSP(x) (SCM_CONSP (x) \
|| (SCM_TYP3(x) == 1 \