summaryrefslogtreecommitdiff
path: root/libguile/boolean.c
diff options
context:
space:
mode:
authorMarius Vollmer <mvo@zagadka.de>2004-07-06 10:25:37 +0000
committerMarius Vollmer <mvo@zagadka.de>2004-07-06 10:25:37 +0000
commit1fe56d60fda532eba3b4f689a671a2f939191e50 (patch)
treeb97debd1fff67458fc83454477117032e3c44672 /libguile/boolean.c
parent73e4de09b9f21609251df9e1098105208bac1a63 (diff)
downloadguile-1fe56d60fda532eba3b4f689a671a2f939191e50.tar.gz
(scm_is_bool): Fix typo.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL, SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h". Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and scm_is_bool, respectively.
Diffstat (limited to 'libguile/boolean.c')
-rw-r--r--libguile/boolean.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/libguile/boolean.c b/libguile/boolean.c
index 1f6b5b037..be4332806 100644
--- a/libguile/boolean.c
+++ b/libguile/boolean.c
@@ -23,6 +23,8 @@
#include "libguile/validate.h"
#include "libguile/boolean.h"
#include "libguile/lang.h"
+#include "libguile/tags.h"
+
@@ -31,7 +33,7 @@ SCM_DEFINE (scm_not, "not", 1, 0, 0,
"Return @code{#t} iff @var{x} is @code{#f}, else return @code{#f}.")
#define FUNC_NAME s_scm_not
{
- return SCM_BOOL(SCM_FALSEP (x) || SCM_NILP (x));
+ return scm_from_bool (scm_is_false (x) || SCM_NILP (x));
}
#undef FUNC_NAME
@@ -41,14 +43,14 @@ SCM_DEFINE (scm_boolean_p, "boolean?", 1, 0, 0,
"Return @code{#t} iff @var{obj} is either @code{#t} or @code{#f}.")
#define FUNC_NAME s_scm_boolean_p
{
- return SCM_BOOL (SCM_BOOLP (obj) || SCM_NILP (obj));
+ return scm_from_bool (scm_is_bool (obj) || SCM_NILP (obj));
}
#undef FUNC_NAME
int
scm_is_bool (SCM x)
{
- return scm_is_eq (x, SCM_BOOL_F) || scm_is_eq (SCM_BOOL_T);
+ return scm_is_eq (x, SCM_BOOL_F) || scm_is_eq (x, SCM_BOOL_T);
}
int