diff options
| author | Andy Wingo <wingo@pobox.com> | 2010-08-08 14:15:47 +0200 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2010-08-08 14:15:47 +0200 |
| commit | 8a4ed2dd34c86eb451c5555a85f64f3fbdf9cef6 (patch) | |
| tree | 592132af4f874860a2202420842b0c9c24af2b2b /libguile/boolean.h | |
| parent | 220058a8353815f2cefa67e2510b7132991cf7a7 (diff) | |
| download | guile-8a4ed2dd34c86eb451c5555a85f64f3fbdf9cef6.tar.gz | |
remove "discouraged" infrastructure
* libguile/discouraged.h: Remove.
* libguile/deprecated.c (scm_internal_select, scm_thread_sleep)
(scm_thread_usleep): Deprecate formerly discouraged names.
* libguile/eq.h (SCM_EQ_P):
* libguile/pairs.h (SCM_NULLP, SCM_NNULLP, SCM_CONSP, SCM_NCONSP):
* libguile/boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOLP, SCM_BOOL):
(SCM_NEGATE_BOOL, SCM_BOOL_NOT): Undiscourage these names, because I'm
not sure deprecating them will do any good.
* libguile.h:
* libguile/gen-scmconfig.c:
* libguile/numbers.c:
* libguile/init.c:
* libguile/Makefile.am:
* configure.ac: Remove bits that referenced discouraged.h, and dealt
with the "discouraging" system.
Diffstat (limited to 'libguile/boolean.h')
| -rw-r--r-- | libguile/boolean.h | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/libguile/boolean.h b/libguile/boolean.h index 7084fdf29..8f55f1ee5 100644 --- a/libguile/boolean.h +++ b/libguile/boolean.h @@ -56,8 +56,7 @@ (SCM_MATCHES_BITS_IN_COMMON ((x), SCM_ELISP_NIL, SCM_BOOL_F)) #define scm_is_true_and_not_nil(x) (!scm_is_false_or_nil (x)) -/* -#nil is false. */ +/* #nil is false. */ #define scm_is_false(x) (scm_is_false_or_nil (x)) #define scm_is_true(x) (!scm_is_false (x)) @@ -91,6 +90,17 @@ SCM_API int scm_to_bool (SCM x); +/* Older spellings for the above routines, kept around for + compatibility. */ +#define SCM_FALSEP(x) (scm_is_false (x)) +#define SCM_NFALSEP(x) (scm_is_true (x)) +#define SCM_BOOLP(x) (scm_is_bool (x)) +#define SCM_BOOL(x) (scm_from_bool (x)) +#define SCM_NEGATE_BOOL(f) (scm_from_bool (!(f))) +#define SCM_BOOL_NOT(x) (scm_not (x)) + + + /* * The following macros efficiently implement boolean truth testing as * expected by most lisps, which treat '() aka SCM_EOL as false. |