diff options
author | Andy Wingo <wingo@pobox.com> | 2010-03-23 20:23:19 +0100 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2010-03-30 10:31:27 +0200 |
commit | d38b431ace4b01e5da9cb09bb6341277f2974160 (patch) | |
tree | 745db83549f083455e0ac4e96058da3e67acbba7 /libguile/vm-i-system.c | |
parent | 655aadf4b09c40f4c7854e4325e8809fcb7cb36b (diff) | |
download | guile-d38b431ace4b01e5da9cb09bb6341277f2974160.tar.gz |
nil is false, whee
* libguile/boolean.h (scm_is_false): Recognize nil as false, by default.
(scm_is_bool): Recognize nil as a boolean.
* libguile/boolean.c (scm_not, scm_boolean, scm_to_bool, scm_is_bool):
Adapt to treat nil as false.
* libguile/vm-i-system.c (br-if, br-if-not): Just use scm_is_false
instead of specifically mentioning nil.
Diffstat (limited to 'libguile/vm-i-system.c')
-rw-r--r-- | libguile/vm-i-system.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libguile/vm-i-system.c b/libguile/vm-i-system.c index 27c6c3374..76ae0691d 100644 --- a/libguile/vm-i-system.c +++ b/libguile/vm-i-system.c @@ -484,12 +484,12 @@ VM_DEFINE_INSTRUCTION (35, br, "br", 3, 0, 0) VM_DEFINE_INSTRUCTION (36, br_if, "br-if", 3, 0, 0) { - BR (scm_is_true_and_not_nil (*sp)); + BR (scm_is_true (*sp)); } VM_DEFINE_INSTRUCTION (37, br_if_not, "br-if-not", 3, 0, 0) { - BR (scm_is_false_or_nil (*sp)); + BR (scm_is_false (*sp)); } VM_DEFINE_INSTRUCTION (38, br_if_eq, "br-if-eq", 3, 0, 0) |