1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-04-30 03:40:34 +02:00

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.
This commit is contained in:
Andy Wingo 2010-08-08 14:15:47 +02:00
parent 220058a835
commit 8a4ed2dd34
13 changed files with 77 additions and 123 deletions

View file

@ -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.