summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac10
-rw-r--r--libguile/boolean.h18
-rw-r--r--libguile/gen-scmconfig.c5
-rw-r--r--libguile/gen-scmconfig.h.in1
-rw-r--r--libguile/init.c2
-rw-r--r--libguile/lang.c6
-rw-r--r--libguile/lang.h11
-rw-r--r--libguile/pairs.h8
-rw-r--r--libguile/private-options.h9
-rw-r--r--libguile/read.c4
10 files changed, 8 insertions, 66 deletions
diff --git a/configure.ac b/configure.ac
index 9203cb405..73a4bd24d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -160,10 +160,6 @@ fi
AC_DEFINE_UNQUOTED([SCM_WARN_DEPRECATED_DEFAULT], "$warn_default",
[Define this to control the default warning level for deprecated features.])
-AC_ARG_ENABLE(elisp,
- [ --disable-elisp omit Emacs Lisp support],,
- enable_elisp=yes)
-
dnl Added the following configure option in January 2008 following
dnl investigation of problems with "64" system and library calls on
dnl Darwin (MacOS X). The libguile code (_scm.h) assumes that if a
@@ -254,11 +250,6 @@ if test "$enable_debug_malloc" = yes; then
AC_LIBOBJ([debug-malloc])
fi
-if test "$enable_elisp" = yes; then
- SCM_I_GSC_ENABLE_ELISP=1
-else
- SCM_I_GSC_ENABLE_ELISP=0
-fi
AC_CHECK_LIB(uca, __uc_get_ar_bsp)
AC_C_CONST
@@ -1622,7 +1613,6 @@ AC_SUBST([sitedir])
AC_SUBST([SCM_I_GSC_GUILE_DEBUG])
AC_SUBST([SCM_I_GSC_ENABLE_DISCOURAGED])
AC_SUBST([SCM_I_GSC_ENABLE_DEPRECATED])
-AC_SUBST([SCM_I_GSC_ENABLE_ELISP])
AC_SUBST([SCM_I_GSC_STACK_GROWS_UP])
AC_SUBST([SCM_I_GSC_C_INLINE])
AC_CONFIG_FILES([libguile/gen-scmconfig.h])
diff --git a/libguile/boolean.h b/libguile/boolean.h
index 007500e10..3e9debd20 100644
--- a/libguile/boolean.h
+++ b/libguile/boolean.h
@@ -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
diff --git a/libguile/gen-scmconfig.c b/libguile/gen-scmconfig.c
index c1d6aadd9..851578f46 100644
--- a/libguile/gen-scmconfig.c
+++ b/libguile/gen-scmconfig.c
@@ -232,11 +232,6 @@ main (int argc, char *argv[])
pf ("/* (value will be 0 or 1). */\n");
pf ("#define SCM_ENABLE_DEPRECATED %d\n", SCM_I_GSC_ENABLE_DEPRECATED);
- /*** SCM_ENABLE_ELISP (0 or 1) ***/
- pf ("\n");
- pf ("/* Set to 1 to add Elisp support (in addition to Scheme). */\n");
- pf ("#define SCM_ENABLE_ELISP %d /* 0 or 1 */\n", SCM_I_GSC_ENABLE_ELISP);
-
/*** SCM_STACK_GROWS_UP (0 or 1) ***/
pf ("\n");
pf ("/* Set to 1 if the stack grows up, 0 otherwise. */\n");
diff --git a/libguile/gen-scmconfig.h.in b/libguile/gen-scmconfig.h.in
index f36fb096a..11c519717 100644
--- a/libguile/gen-scmconfig.h.in
+++ b/libguile/gen-scmconfig.h.in
@@ -9,7 +9,6 @@
#define SCM_I_GSC_GUILE_DEBUG @SCM_I_GSC_GUILE_DEBUG@
#define SCM_I_GSC_ENABLE_DISCOURAGED @SCM_I_GSC_ENABLE_DISCOURAGED@
#define SCM_I_GSC_ENABLE_DEPRECATED @SCM_I_GSC_ENABLE_DEPRECATED@
-#define SCM_I_GSC_ENABLE_ELISP @SCM_I_GSC_ENABLE_ELISP@
#define SCM_I_GSC_STACK_GROWS_UP @SCM_I_GSC_STACK_GROWS_UP@
#define SCM_I_GSC_C_INLINE @SCM_I_GSC_C_INLINE@
#define SCM_I_GSC_NEEDS_STDINT_H @SCM_I_GSC_NEEDS_STDINT_H@
diff --git a/libguile/init.c b/libguile/init.c
index d6f619698..f5e8e6418 100644
--- a/libguile/init.c
+++ b/libguile/init.c
@@ -557,9 +557,7 @@ scm_i_init_guile (SCM_STACKITEM *base)
scm_init_simpos ();
scm_init_dynamic_linking (); /* Requires smob_prehistory */
scm_bootstrap_i18n ();
-#if SCM_ENABLE_ELISP
scm_init_lang ();
-#endif /* SCM_ENABLE_ELISP */
scm_init_script ();
scm_init_goops ();
diff --git a/libguile/lang.c b/libguile/lang.c
index 85da68034..9a87bb481 100644
--- a/libguile/lang.c
+++ b/libguile/lang.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999, 2000, 2001, 2006, 2008 Free Software Foundation, Inc.
+/* Copyright (C) 1999, 2000, 2001, 2006, 2008, 2010 Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -36,8 +36,6 @@
/* {Multi-language support}
*/
-#if SCM_ENABLE_ELISP
-
void
scm_init_lang ()
{
@@ -46,8 +44,6 @@ scm_init_lang ()
scm_c_define ("%nil", SCM_ELISP_NIL);
}
-#endif /* SCM_ENABLE_ELISP */
-
/*
Local Variables:
c-file-style: "gnu"
diff --git a/libguile/lang.h b/libguile/lang.h
index b86fb2e0a..d0482eeb2 100644
--- a/libguile/lang.h
+++ b/libguile/lang.h
@@ -3,7 +3,7 @@
#ifndef SCM_LANG_H
#define SCM_LANG_H
-/* Copyright (C) 1998, 2004, 2006, 2008, 2009 Free Software Foundation, Inc.
+/* Copyright (C) 1998, 2004, 2006, 2008, 2009, 2010 Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -27,20 +27,13 @@
-#if SCM_ENABLE_ELISP
-
#define SCM_NILP(x) (scm_is_eq ((x), SCM_ELISP_NIL))
SCM_INTERNAL void scm_init_lang (void);
-#else /* ! SCM_ENABLE_ELISP */
-
-#define SCM_NILP(x) 0
-
-#endif /* ! SCM_ENABLE_ELISP */
-
#define SCM_NULL_OR_NIL_P(x) (scm_is_null_or_nil (x))
+
#endif /* SCM_LANG_H */
/*
diff --git a/libguile/pairs.h b/libguile/pairs.h
index 090c9c13e..861f9a048 100644
--- a/libguile/pairs.h
+++ b/libguile/pairs.h
@@ -3,7 +3,7 @@
#ifndef SCM_PAIRS_H
#define SCM_PAIRS_H
-/* Copyright (C) 1995,1996,2000,2001, 2004, 2006, 2008, 2009 Free Software Foundation, Inc.
+/* Copyright (C) 1995,1996,2000,2001, 2004, 2006, 2008, 2009, 2010 Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -51,12 +51,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_null_or_nil(x) \
+#define scm_is_null_or_nil(x) \
(SCM_MATCHES_BITS_IN_COMMON ((x), SCM_ELISP_NIL, SCM_EOL))
-#else
-# define scm_is_null_or_nil(x) (scm_is_null_assume_not_nil (x))
-#endif
/* %nil is null. */
#define scm_is_null(x) (scm_is_null_or_nil(x))
diff --git a/libguile/private-options.h b/libguile/private-options.h
index 2e9728dce..7ef19c9a9 100644
--- a/libguile/private-options.h
+++ b/libguile/private-options.h
@@ -91,20 +91,11 @@ SCM_API scm_t_option scm_read_opts[];
#define SCM_RECORD_POSITIONS_P scm_read_opts[1].val
#define SCM_CASE_INSENSITIVE_P scm_read_opts[2].val
#define SCM_KEYWORD_STYLE scm_read_opts[3].val
-#if SCM_ENABLE_ELISP
#define SCM_ELISP_VECTORS_P scm_read_opts[4].val
#define SCM_ESCAPED_PARENS_P scm_read_opts[5].val
#define SCM_R6RS_ESCAPES_P scm_read_opts[6].val
#define SCM_SQUARE_BRACKETS_P scm_read_opts[7].val
-#else
-#define SCM_R6RS_ESCAPES_P scm_read_opts[4].val
-#define SCM_SQUARE_BRACKETS_P scm_read_opts[5].val
-#endif
-#if SCM_ENABLE_ELISP
#define SCM_N_READ_OPTIONS 8
-#else
-#define SCM_N_READ_OPTIONS 6
-#endif
#endif /* PRIVATE_OPTIONS */
diff --git a/libguile/read.c b/libguile/read.c
index e17735ed0..ee8786133 100644
--- a/libguile/read.c
+++ b/libguile/read.c
@@ -70,12 +70,10 @@ scm_t_option scm_read_opts[] = {
"Convert symbols to lower case."},
{ SCM_OPTION_SCM, "keywords", (unsigned long) SCM_BOOL_F,
"Style of keyword recognition: #f, 'prefix or 'postfix."},
-#if SCM_ENABLE_ELISP
{ SCM_OPTION_BOOLEAN, "elisp-vectors", 0,
"Support Elisp vector syntax, namely `[...]'."},
{ SCM_OPTION_BOOLEAN, "elisp-strings", 0,
"Support `\\(' and `\\)' in strings."},
-#endif
{ SCM_OPTION_BOOLEAN, "r6rs-hex-escapes", 0,
"Use R6RS variable-length character and string hex escapes."},
{ SCM_OPTION_BOOLEAN, "square-brackets", 1,
@@ -509,13 +507,11 @@ scm_read_string (int chr, SCM port)
case '"':
case '\\':
break;
-#if SCM_ENABLE_ELISP
case '(':
case ')':
if (SCM_ESCAPED_PARENS_P)
break;
goto bad_escaped;
-#endif
case '\n':
continue;
case '0':