From b02b05332f45fc6ac4f99556cda9fb7ee894e673 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Tue, 27 Oct 2009 22:59:22 +0100 Subject: fix nil handling in the vm * libguile/vm-i-scheme.c (not, not-not): Treat nil as false. (null?, not-null?): Treat nil as null. * libguile/vm-i-system.c (br-if, br-if-not): Treat nil as false. (br-if-null, br-if-not-null): Treat nil as null. --- libguile/vm-i-scheme.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libguile/vm-i-scheme.c') diff --git a/libguile/vm-i-scheme.c b/libguile/vm-i-scheme.c index b4aadf931..ff963d64c 100644 --- a/libguile/vm-i-scheme.c +++ b/libguile/vm-i-scheme.c @@ -32,13 +32,13 @@ VM_DEFINE_FUNCTION (100, not, "not", 1) { ARGS1 (x); - RETURN (SCM_BOOL (SCM_FALSEP (x))); + RETURN (SCM_BOOL (scm_is_false_or_nil (x))); } VM_DEFINE_FUNCTION (101, not_not, "not-not", 1) { ARGS1 (x); - RETURN (SCM_BOOL (!SCM_FALSEP (x))); + RETURN (SCM_BOOL (!scm_is_false_or_nil (x))); } VM_DEFINE_FUNCTION (102, eq, "eq?", 2) @@ -56,13 +56,13 @@ VM_DEFINE_FUNCTION (103, not_eq, "not-eq?", 2) VM_DEFINE_FUNCTION (104, nullp, "null?", 1) { ARGS1 (x); - RETURN (SCM_BOOL (SCM_NULLP (x))); + RETURN (SCM_BOOL (scm_is_null_or_nil (x))); } VM_DEFINE_FUNCTION (105, not_nullp, "not-null?", 1) { ARGS1 (x); - RETURN (SCM_BOOL (!SCM_NULLP (x))); + RETURN (SCM_BOOL (!scm_is_null_or_nil (x))); } VM_DEFINE_FUNCTION (106, eqv, "eqv?", 2) -- cgit v1.2.3