1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-16 16:50:21 +02:00

(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.
This commit is contained in:
Marius Vollmer 2004-07-06 10:25:37 +00:00
parent 73e4de09b9
commit 1fe56d60fd

View file

@ -23,6 +23,8 @@
#include "libguile/validate.h" #include "libguile/validate.h"
#include "libguile/boolean.h" #include "libguile/boolean.h"
#include "libguile/lang.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}.") "Return @code{#t} iff @var{x} is @code{#f}, else return @code{#f}.")
#define FUNC_NAME s_scm_not #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 #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}.") "Return @code{#t} iff @var{obj} is either @code{#t} or @code{#f}.")
#define FUNC_NAME s_scm_boolean_p #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 #undef FUNC_NAME
int int
scm_is_bool (SCM x) 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 int