summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2009-12-05 12:47:58 +0100
committerAndy Wingo <wingo@pobox.com>2009-12-05 12:47:58 +0100
commitce65df9f09577e4f566b467ee8647617204b9b40 (patch)
treeb2855ee65af3b4366e4c434a742f75678b15d7b7
parent8f79d4ed542686df8345b7b9e3e1d3e14cf4b955 (diff)
downloadguile-ce65df9f09577e4f566b467ee8647617204b9b40.tar.gz
structs are alive early in guile's boot
* libguile/init.c (scm_i_init_guile): Reorder deps so structs are initialized early in the boot process.
-rw-r--r--libguile/init.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/libguile/init.c b/libguile/init.c
index 9ffc90a72..33857b709 100644
--- a/libguile/init.c
+++ b/libguile/init.c
@@ -443,6 +443,11 @@ scm_i_init_guile (SCM_STACKITEM *base)
scm_smob_prehistory ();
scm_symbols_prehistory (); /* requires weaks_prehistory */
scm_modules_prehistory ();
+ scm_init_array_handle ();
+ scm_init_generalized_arrays ();
+ scm_init_generalized_vectors ();
+ scm_init_strings (); /* Requires array-handle, generalized-vectors */
+ scm_init_struct (); /* Requires strings */
scm_init_variable ();
scm_init_continuations (); /* requires smob_prehistory */
scm_init_root (); /* requires continuations */
@@ -504,21 +509,16 @@ scm_i_init_guile (SCM_STACKITEM *base)
scm_init_srcprop (); /* requires smob_prehistory */
scm_init_stackchk ();
- scm_init_array_handle ();
- scm_init_generalized_arrays ();
- scm_init_generalized_vectors ();
- scm_init_vectors ();
+ scm_init_vectors (); /* Requires array-handle, generalized-vectors */
scm_init_uniform ();
- scm_init_bitvectors (); /* Requires smob_prehistory */
- scm_bootstrap_bytevectors ();
- scm_init_srfi_4 (); /* requires smob_prehistory */
- scm_init_arrays (); /* Requires smob_prehistory */
+ scm_init_bitvectors (); /* Requires smob_prehistory, array-handle, generalized-vectors */
+ scm_bootstrap_bytevectors (); /* Requires smob_prehistory, array-handle, generalized-vectors */
+ scm_init_srfi_4 (); /* Requires smob_prehistory, array-handle, generalized-vectors */
+ scm_init_arrays (); /* Requires smob_prehistory, array-handle */
scm_init_array_map ();
scm_bootstrap_vm (); /* requires smob_prehistory, gc_permanent_object */
- scm_init_strings (); /* Requires array-handle */
- scm_init_struct (); /* Requires strings */
scm_init_frames (); /* Requires smob_prehistory */
scm_init_stacks (); /* Requires strings, struct, frames */
scm_init_symbols ();