summaryrefslogtreecommitdiff
path: root/libguile/boolean.c
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2010-03-23 20:23:19 +0100
committerAndy Wingo <wingo@pobox.com>2010-03-30 10:31:27 +0200
commitd38b431ace4b01e5da9cb09bb6341277f2974160 (patch)
tree745db83549f083455e0ac4e96058da3e67acbba7 /libguile/boolean.c
parent655aadf4b09c40f4c7854e4325e8809fcb7cb36b (diff)
downloadguile-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/boolean.c')
-rw-r--r--libguile/boolean.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/libguile/boolean.c b/libguile/boolean.c
index 3391d6ce5..7d58582a2 100644
--- a/libguile/boolean.c
+++ b/libguile/boolean.c
@@ -56,28 +56,27 @@ verify (SCM_VALUES_DIFFER_IN_EXACTLY_TWO_BIT_POSITIONS \
SCM_DEFINE (scm_not, "not", 1, 0, 0,
(SCM x),
- "Return @code{#t} iff @var{x} is @code{#f}, else return @code{#f}.")
+ "Return @code{#t} iff @var{x} is false, else return @code{#f}.")
#define FUNC_NAME s_scm_not
{
- return scm_from_bool (scm_is_false_or_nil (x));
+ return scm_from_bool (scm_is_false (x));
}
#undef FUNC_NAME
SCM_DEFINE (scm_boolean_p, "boolean?", 1, 0, 0,
(SCM obj),
- "Return @code{#t} iff @var{obj} is either @code{#t} or @code{#f}.")
+ "Return @code{#t} iff @var{obj} is @code{#t} or false.")
#define FUNC_NAME s_scm_boolean_p
{
- return scm_from_bool (scm_is_bool_or_nil (obj));
+ return scm_from_bool (scm_is_bool (obj));
}
#undef FUNC_NAME
int
scm_to_bool (SCM x)
{
- /* XXX Should this first test use scm_is_false_or_nil instead? */
- if (scm_is_eq (x, SCM_BOOL_F))
+ if (scm_is_false (x))
return 0;
else if (scm_is_eq (x, SCM_BOOL_T))
return 1;
@@ -93,7 +92,7 @@ int
scm_is_bool (SCM obj)
{
/* This must match the macro definition of `scm_is_bool ()'. */
- return scm_is_bool_and_not_nil (obj);
+ return scm_is_bool_or_nil (obj);
}