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

lisp nil always enabled

* configure.ac: Remove --disable-elisp option. Lisp nil is always
  enabled.

* libguile/boolean.h:
* libguile/gen-scmconfig.c:
* libguile/gen-scmconfig.h.in:
* libguile/init.c:
* libguile/lang.c:
* libguile/lang.h:
* libguile/pairs.h:
* libguile/private-options.h:
* libguile/read.c: Remove conditionals for disabling elisp.
This commit is contained in:
Andy Wingo 2010-04-09 14:03:02 +02:00
parent 92e19ec06d
commit c1b7c940ec
10 changed files with 8 additions and 66 deletions

View file

@ -52,12 +52,8 @@
* SCM_MATCHES_BITS_IN_COMMON in tags.h for more information on
* how the following macro works.
*/
#if SCM_ENABLE_ELISP
# define scm_is_false_or_nil(x) \
#define scm_is_false_or_nil(x) \
(SCM_MATCHES_BITS_IN_COMMON ((x), SCM_ELISP_NIL, SCM_BOOL_F))
#else
# define scm_is_false_or_nil(x) (scm_is_false_assume_not_nil (x))
#endif
#define scm_is_true_and_not_nil(x) (!scm_is_false_or_nil (x))
/* %nil is false. */
@ -80,13 +76,8 @@
* SCM_BOOL_T, SCM_ELISP_NIL, or SCM_XXX_ANOTHER_BOOLEAN_DONT_USE_0.
* Otherwise, it returns 0.
*/
#if SCM_ENABLE_ELISP
# define scm_is_bool_or_nil(x) \
#define scm_is_bool_or_nil(x) \
(SCM_MATCHES_BITS_IN_COMMON ((x), SCM_BOOL_T, SCM_ELISP_NIL))
#else
# define scm_is_bool_or_nil(x) (scm_is_bool_and_not_nil (x))
#endif
#define scm_is_bool_and_not_nil(x) \
(SCM_MATCHES_BITS_IN_COMMON ((x), SCM_BOOL_F, SCM_BOOL_T))
@ -117,11 +108,8 @@ SCM_API int scm_to_bool (SCM x);
* following: SCM_BOOL_F, SCM_ELISP_NIL, SCM_EOL or
* SCM_XXX_ANOTHER_LISP_FALSE_DONT_USE. Otherwise, it returns 0.
*/
#if SCM_ENABLE_ELISP
# define scm_is_lisp_false(x) \
#define scm_is_lisp_false(x) \
(SCM_MATCHES_BITS_IN_COMMON ((x), SCM_BOOL_F, SCM_EOL))
# define scm_is_lisp_true(x) (!scm_is_lisp_false(x))
#endif