diff options
| author | Marius Vollmer <mvo@zagadka.de> | 2004-07-06 10:05:45 +0000 |
|---|---|---|
| committer | Marius Vollmer <mvo@zagadka.de> | 2004-07-06 10:05:45 +0000 |
| commit | ede310d888afd9d5ef8d36fc0f30b6263d6dc807 (patch) | |
| tree | a126b9e459417677a9c4e7dbbfc777072e836d65 /libguile/boolean.h | |
| parent | 0954f871cdd1cc201b99c3295ff32eae853b3be5 (diff) | |
| download | guile-ede310d888afd9d5ef8d36fc0f30b6263d6dc807.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.
* boolean.h (scm_is_bool): Fix bug in prototype.
(scm_from_bool): The argument is "x" not "f", stupid.
Diffstat (limited to 'libguile/boolean.h')
| -rw-r--r-- | libguile/boolean.h | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/libguile/boolean.h b/libguile/boolean.h index 63cc06006..5285021ae 100644 --- a/libguile/boolean.h +++ b/libguile/boolean.h @@ -29,29 +29,13 @@ /* Boolean Values * */ -#define SCM_FALSEP(x) (SCM_EQ_P ((x), SCM_BOOL_F)) -#define SCM_NFALSEP(x) (!SCM_FALSEP (x)) -#define SCM_BOOLP(x) (SCM_EQ_P ((x), SCM_BOOL_F) || SCM_EQ_P ((x), SCM_BOOL_T)) - -/* Convert from a C boolean to a SCM boolean value */ -#define SCM_BOOL(f) ((f) ? SCM_BOOL_T : SCM_BOOL_F) - -/* Convert from a C boolean to a SCM boolean value and negate it */ -#define SCM_NEGATE_BOOL(f) ((f) ? SCM_BOOL_F : SCM_BOOL_T) - -/* SCM_BOOL_NOT returns the other boolean. - * The order of ^s here is important for Borland C++ (!?!?!) - */ -#define SCM_BOOL_NOT(x) (SCM_PACK (SCM_UNPACK (x) \ - ^ (SCM_UNPACK (SCM_BOOL_T) \ - ^ SCM_UNPACK (SCM_BOOL_F)))) #define scm_is_false(x) scm_is_eq ((x), SCM_BOOL_F) #define scm_is_true(x) !scm_is_false (x) -SCM_API int scm_is_bool(x); -#define scm_from_bool(x) ((f) ? SCM_BOOL_T : SCM_BOOL_F) +SCM_API int scm_is_bool (SCM x); +#define scm_from_bool(x) ((x) ? SCM_BOOL_T : SCM_BOOL_F) SCM_API int scm_to_bool (SCM x); |