diff options
| author | Marius Vollmer <mvo@zagadka.de> | 2004-07-06 10:59:25 +0000 |
|---|---|---|
| committer | Marius Vollmer <mvo@zagadka.de> | 2004-07-06 10:59:25 +0000 |
| commit | 7888309be8638cb5b75db163383a3d977bd9769d (patch) | |
| tree | 1dd35eb478f799c14dfe75756bb870a56ce1ba3f /libguile/evalext.c | |
| parent | 9c293a3d2f20f783cc59d749f4d6bcd09fbb0cd5 (diff) | |
| download | guile-7888309be8638cb5b75db163383a3d977bd9769d.tar.gz | |
* 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/evalext.c')
| -rw-r--r-- | libguile/evalext.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libguile/evalext.c b/libguile/evalext.c index 0590f48c9..c6e6dea76 100644 --- a/libguile/evalext.c +++ b/libguile/evalext.c @@ -49,7 +49,7 @@ SCM_DEFINE (scm_defined_p, "defined?", 1, 1, 0, { SCM_ASSERT (SCM_CONSP (frames), env, SCM_ARG2, FUNC_NAME); b = SCM_CAR (frames); - if (!SCM_FALSEP (scm_procedure_p (b))) + if (scm_is_true (scm_procedure_p (b))) break; SCM_ASSERT (SCM_CONSP (b), env, SCM_ARG2, FUNC_NAME); for (b = SCM_CAR (b); SCM_NIMP (b); b = SCM_CDR (b)) @@ -70,7 +70,7 @@ SCM_DEFINE (scm_defined_p, "defined?", 1, 1, 0, SCM_BOOL_F); } - return (SCM_FALSEP (var) || SCM_UNBNDP (SCM_VARIABLE_REF (var)) + return (scm_is_false (var) || SCM_UNBNDP (SCM_VARIABLE_REF (var)) ? SCM_BOOL_F : SCM_BOOL_T); } @@ -93,7 +93,7 @@ SCM_DEFINE (scm_self_evaluating_p, "self-evaluating?", 1, 0, 0, return SCM_BOOL_T; case scm_tc3_imm24: /* characters, booleans, other immediates */ - return SCM_BOOL (!SCM_NULLP (obj)); + return scm_from_bool (!SCM_NULLP (obj)); case scm_tc3_cons: switch (SCM_TYP7 (obj)) { |