summaryrefslogtreecommitdiff
path: root/libguile/pairs.h
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2010-03-23 20:29:22 +0100
committerAndy Wingo <wingo@pobox.com>2010-03-30 10:31:27 +0200
commit2533f10b40cdab357140347fe05e291f02bb5cb5 (patch)
treebca95f90c64419a6899ce13a31b1df0cbbcbdb9e /libguile/pairs.h
parentd38b431ace4b01e5da9cb09bb6341277f2974160 (diff)
downloadguile-2533f10b40cdab357140347fe05e291f02bb5cb5.tar.gz
nil is null, whee
* libguile/pairs.h (scm_is_null): Nil is also null. * libguile/vm-i-scheme.c (not, not-not, null?, not-null?): * libguile/vm-i-system.c (br-if-null, br-if-not-null): Remove some more nil special cases.
Diffstat (limited to 'libguile/pairs.h')
-rw-r--r--libguile/pairs.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/libguile/pairs.h b/libguile/pairs.h
index 81d89b56b..090c9c13e 100644
--- a/libguile/pairs.h
+++ b/libguile/pairs.h
@@ -58,8 +58,8 @@
# define scm_is_null_or_nil(x) (scm_is_null_assume_not_nil (x))
#endif
-/* XXX Should scm_is_null treat %nil as null by default? */
-#define scm_is_null(x) (scm_is_null_and_not_nil(x))
+/* %nil is null. */
+#define scm_is_null(x) (scm_is_null_or_nil(x))
#define SCM_CAR(x) (SCM_VALIDATE_PAIR (x, SCM_CELL_OBJECT_0 (x)))
#define SCM_CDR(x) (SCM_VALIDATE_PAIR (x, SCM_CELL_OBJECT_1 (x)))