diff options
author | Ludovic Courtès <ludo@gnu.org> | 2009-08-28 19:01:19 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2009-08-28 19:16:46 +0200 |
commit | 7af531508c5931261ff8957708642cac67bf86a5 (patch) | |
tree | bd36d27d9f7a11d954093d4121ccb9e645f5c59f /libguile/init.c | |
parent | f86f3b5b113b4cb383c531150b13bef9b2789221 (diff) | |
parent | ce3ed0125fcfb9ad09da815f133a2320102d164c (diff) | |
download | guile-7af531508c5931261ff8957708642cac67bf86a5.tar.gz |
Merge branch 'master' into boehm-demers-weiser-gc
Conflicts:
libguile/Makefile.am
libguile/bytevectors.c
libguile/gc-card.c
libguile/gc-mark.c
libguile/programs.c
libguile/srcprop.c
libguile/srfi-14.c
libguile/symbols.c
libguile/threads.c
libguile/unif.c
libguile/vm.c
Diffstat (limited to 'libguile/init.c')
-rw-r--r-- | libguile/init.c | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/libguile/init.c b/libguile/init.c index dbb132446..940d515f6 100644 --- a/libguile/init.c +++ b/libguile/init.c @@ -37,6 +37,7 @@ #include "libguile/arbiters.h" #include "libguile/async.h" #include "libguile/backtrace.h" +#include "libguile/bitvectors.h" #include "libguile/boolean.h" #include "libguile/bytevectors.h" #include "libguile/chars.h" @@ -62,6 +63,8 @@ #include "libguile/futures.h" #include "libguile/gc.h" #include "libguile/gdbint.h" +#include "libguile/generalized-arrays.h" +#include "libguile/generalized-vectors.h" #include "libguile/goops.h" #include "libguile/gsubr.h" #include "libguile/hash.h" @@ -92,7 +95,7 @@ #include "libguile/procprop.h" #include "libguile/procs.h" #include "libguile/properties.h" -#include "libguile/ramap.h" +#include "libguile/array-map.h" #include "libguile/random.h" #include "libguile/rdelim.h" #include "libguile/read.h" @@ -115,7 +118,7 @@ #include "libguile/struct.h" #include "libguile/symbols.h" #include "libguile/throw.h" -#include "libguile/unif.h" +#include "libguile/arrays.h" #include "libguile/values.h" #include "libguile/variable.h" #include "libguile/vectors.h" @@ -125,6 +128,7 @@ #include "libguile/weaks.h" #include "libguile/guardians.h" #include "libguile/extensions.h" +#include "libguile/uniform.h" #include "libguile/srfi-4.h" #include "libguile/discouraged.h" #include "libguile/deprecated.h" @@ -519,7 +523,19 @@ scm_i_init_guile (SCM_STACKITEM *base) scm_init_sort (); scm_init_srcprop (); scm_init_stackchk (); - scm_init_strings (); + + scm_init_array_handle (); + scm_init_generalized_arrays (); + scm_init_generalized_vectors (); + scm_init_vectors (); + scm_init_uniform (); + scm_init_bitvectors (); + scm_bootstrap_bytevectors (); + scm_init_srfi_4 (); + scm_init_arrays (); + scm_init_array_map (); + + scm_init_strings (); /* Requires array-handle */ scm_init_struct (); /* Requires strings */ scm_init_stacks (); /* Requires strings, struct */ scm_init_symbols (); @@ -533,7 +549,6 @@ scm_i_init_guile (SCM_STACKITEM *base) scm_init_srfi_13 (); scm_init_srfi_14 (); scm_init_throw (); - scm_init_vectors (); scm_init_version (); scm_init_weaks (); scm_init_guardians (); @@ -542,8 +557,6 @@ scm_i_init_guile (SCM_STACKITEM *base) scm_init_evalext (); scm_init_debug (); /* Requires macro smobs */ scm_init_random (); - scm_init_ramap (); - scm_init_unif (); scm_init_simpos (); scm_init_load_path (); scm_init_standard_ports (); /* Requires fports */ @@ -552,7 +565,6 @@ scm_i_init_guile (SCM_STACKITEM *base) scm_init_lang (); #endif /* SCM_ENABLE_ELISP */ scm_init_script (); - scm_init_srfi_4 (); scm_init_goops (); @@ -576,7 +588,6 @@ scm_i_init_guile (SCM_STACKITEM *base) scm_init_rw (); scm_init_extensions (); - scm_bootstrap_bytevectors (); scm_bootstrap_vm (); atexit (cleanup_for_exit); |