summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libguile/ChangeLog14
-rw-r--r--libguile/Makefile.am8
-rw-r--r--libguile/init.c6
-rw-r--r--libguile/modules.c5
-rw-r--r--test-suite/ChangeLog4
-rw-r--r--test-suite/tests/environments.test5
6 files changed, 36 insertions, 6 deletions
diff --git a/libguile/ChangeLog b/libguile/ChangeLog
index 6d3a2db1d..4443132e7 100644
--- a/libguile/ChangeLog
+++ b/libguile/ChangeLog
@@ -1,3 +1,17 @@
+2006-11-02 Neil Jerram <neil@ossau.uklinux.net>
+
+ * modules.c: Correct comment saying that low-level environments
+ will be used "in the next release".
+
+ * init.c: Comment out #include of environments.h.
+ (scm_i_init_guile): Comment out scm_environments_prehistory() and
+ scm_init_environments() calls.
+
+ * Makefile.am (libguile_la_SOURCES): Remove environments.c.
+ (DOT_X_FILES): Remove environments.x.
+ (DOT_DOC_FILES): Remove environments.doc.
+ (modinclude_HEADERS): Remove environments.h.
+
2006-10-25 Neil Jerram <neil@ossau.uklinux.net>
IA64 HP-UX GC patch from Hrvoje Nikšić. (Thanks!)
diff --git a/libguile/Makefile.am b/libguile/Makefile.am
index bf121161f..e8a161afa 100644
--- a/libguile/Makefile.am
+++ b/libguile/Makefile.am
@@ -94,7 +94,7 @@ libguile_la_CFLAGS = $(GUILE_CFLAGS)
libguile_la_SOURCES = alist.c arbiters.c async.c backtrace.c boolean.c \
chars.c continuations.c convert.c debug.c deprecation.c \
- deprecated.c discouraged.c dynwind.c environments.c eq.c error.c \
+ deprecated.c discouraged.c dynwind.c eq.c error.c \
eval.c evalext.c extensions.c feature.c fluids.c fports.c \
futures.c gc.c gc-mark.c gc-segment.c gc-malloc.c gc-card.c \
gc-freelist.c gc_os_dep.c gdbint.c gh_data.c gh_eval.c gh_funcs.c \
@@ -111,7 +111,7 @@ libguile_la_SOURCES = alist.c arbiters.c async.c backtrace.c boolean.c \
DOT_X_FILES = alist.x arbiters.x async.x backtrace.x boolean.x chars.x \
continuations.x debug.x deprecation.x deprecated.x discouraged.x \
- dynl.x dynwind.x environments.x eq.x error.x eval.x evalext.x \
+ dynl.x dynwind.x eq.x error.x eval.x evalext.x \
extensions.x feature.x fluids.x fports.x futures.x gc.x gc-mark.x \
gc-segment.x gc-malloc.x gc-card.x goops.x gsubr.x guardians.x \
hash.x hashtab.x hooks.x i18n.x init.x ioext.x keywords.x lang.x \
@@ -128,7 +128,7 @@ EXTRA_DOT_X_FILES = @EXTRA_DOT_X_FILES@
DOT_DOC_FILES = alist.doc arbiters.doc async.doc backtrace.doc \
boolean.doc chars.doc continuations.doc debug.doc deprecation.doc \
deprecated.doc discouraged.doc dynl.doc dynwind.doc \
- environments.doc eq.doc error.doc eval.doc evalext.doc \
+ eq.doc error.doc eval.doc evalext.doc \
extensions.doc feature.doc fluids.doc fports.doc futures.doc \
gc.doc goops.doc gsubr.doc gc-mark.doc gc-segment.doc \
gc-malloc.doc gc-card.doc guardians.doc hash.doc hashtab.doc \
@@ -185,7 +185,7 @@ modincludedir = $(includedir)/libguile
modinclude_HEADERS = __scm.h alist.h arbiters.h async.h backtrace.h \
boolean.h chars.h continuations.h convert.h debug.h debug-malloc.h \
deprecation.h deprecated.h discouraged.h dynl.h dynwind.h \
- environments.h eq.h error.h eval.h evalext.h extensions.h \
+ eq.h error.h eval.h evalext.h extensions.h \
feature.h filesys.h fluids.h fports.h futures.h gc.h \
gdb_interface.h gdbint.h goops.h gsubr.h guardians.h hash.h \
hashtab.h hooks.h i18n.h init.h inline.h ioext.h iselect.h \
diff --git a/libguile/init.c b/libguile/init.c
index 44810be4e..e3a0bc41a 100644
--- a/libguile/init.c
+++ b/libguile/init.c
@@ -46,7 +46,9 @@
#include "libguile/deprecation.h"
#include "libguile/dynl.h"
#include "libguile/dynwind.h"
+#if 0
#include "libguile/environments.h"
+#endif
#include "libguile/eq.h"
#include "libguile/error.h"
#include "libguile/eval.h"
@@ -434,7 +436,9 @@ scm_i_init_guile (SCM_STACKITEM *base)
scm_struct_prehistory (); /* requires storage */
scm_symbols_prehistory (); /* requires storage */
scm_init_subr_table ();
+#if 0
scm_environments_prehistory (); /* requires storage */
+#endif
scm_modules_prehistory (); /* requires storage and hash tables */
scm_init_variable (); /* all bindings need variables */
scm_init_continuations ();
@@ -443,7 +447,9 @@ scm_i_init_guile (SCM_STACKITEM *base)
scm_init_gsubr ();
scm_init_thread_procs (); /* requires gsubrs */
scm_init_procprop ();
+#if 0
scm_init_environments ();
+#endif
scm_init_alist ();
scm_init_arbiters ();
scm_init_async ();
diff --git a/libguile/modules.c b/libguile/modules.c
index 10f72da3c..cfb42a0b9 100644
--- a/libguile/modules.c
+++ b/libguile/modules.c
@@ -273,8 +273,9 @@ SCM_DEFINE (scm_env_module, "env-module", 1, 0, 0,
/*
* C level implementation of the standard eval closure
*
- * This increases loading speed substantially.
- * The code will be replaced by the low-level environments in next release.
+ * This increases loading speed substantially. The code may be
+ * replaced by something based on environments.[ch], in a future
+ * release.
*/
static SCM module_make_local_var_x_var;
diff --git a/test-suite/ChangeLog b/test-suite/ChangeLog
index 803cb44aa..124b0b5b1 100644
--- a/test-suite/ChangeLog
+++ b/test-suite/ChangeLog
@@ -1,3 +1,7 @@
+2006-11-02 Neil Jerram <neil@ossau.uklinux.net>
+
+ * tests/environments.test: Comment out all tests in this file.
+
2006-10-26 Ludovic Courtès <ludovic.courtes@laas.fr>
* tests/srfi-14.test (Latin-1)[char-set:punctuation]: Fixed a
diff --git a/test-suite/tests/environments.test b/test-suite/tests/environments.test
index 19117e3b5..646efc56a 100644
--- a/test-suite/tests/environments.test
+++ b/test-suite/tests/environments.test
@@ -17,6 +17,9 @@
(use-modules (ice-9 documentation))
+;;; environments are currently commented out of libguile, so these
+;;; tests must be commented out also. - NJ 2006-11-02.
+(if #f (let ()
;;;
;;; miscellaneous
@@ -1043,3 +1046,5 @@
(pass-if "documented?"
(documented? make-import-environment))))
+;;; End of commenting out. - NJ 2006-11-02.
+))