diff options
author | Andy Wingo <wingo@pobox.com> | 2010-03-23 20:29:22 +0100 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2010-03-30 10:31:27 +0200 |
commit | 2533f10b40cdab357140347fe05e291f02bb5cb5 (patch) | |
tree | bca95f90c64419a6899ce13a31b1df0cbbcbdb9e /libguile/vm-i-scheme.c | |
parent | d38b431ace4b01e5da9cb09bb6341277f2974160 (diff) | |
download | guile-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/vm-i-scheme.c')
-rw-r--r-- | libguile/vm-i-scheme.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libguile/vm-i-scheme.c b/libguile/vm-i-scheme.c index 1942a8985..ecc77bdee 100644 --- a/libguile/vm-i-scheme.c +++ b/libguile/vm-i-scheme.c @@ -32,13 +32,13 @@ VM_DEFINE_FUNCTION (128, not, "not", 1) { ARGS1 (x); - RETURN (scm_from_bool (scm_is_false_or_nil (x))); + RETURN (scm_from_bool (scm_is_false (x))); } VM_DEFINE_FUNCTION (129, not_not, "not-not", 1) { ARGS1 (x); - RETURN (scm_from_bool (!scm_is_false_or_nil (x))); + RETURN (scm_from_bool (!scm_is_false (x))); } VM_DEFINE_FUNCTION (130, eq, "eq?", 2) @@ -56,13 +56,13 @@ VM_DEFINE_FUNCTION (131, not_eq, "not-eq?", 2) VM_DEFINE_FUNCTION (132, nullp, "null?", 1) { ARGS1 (x); - RETURN (scm_from_bool (scm_is_null_or_nil (x))); + RETURN (scm_from_bool (scm_is_null (x))); } VM_DEFINE_FUNCTION (133, not_nullp, "not-null?", 1) { ARGS1 (x); - RETURN (scm_from_bool (!scm_is_null_or_nil (x))); + RETURN (scm_from_bool (!scm_is_null (x))); } VM_DEFINE_FUNCTION (134, eqv, "eqv?", 2) |