diff options
author | Mikael Djurfeldt <djurfeldt@nada.kth.se> | 2003-02-19 15:04:51 +0000 |
---|---|---|
committer | Mikael Djurfeldt <djurfeldt@nada.kth.se> | 2003-02-19 15:04:51 +0000 |
commit | c35738c1ae80f3ed9ae7c54532f6477cf7cc8bde (patch) | |
tree | ce2a3e148d68ca7c3f108894fd55e1fb2539da83 /libguile/init.c | |
parent | 0a4c1355501a17924b3aa4dfed0c8d8121fa378f (diff) | |
download | guile-c35738c1ae80f3ed9ae7c54532f6477cf7cc8bde.tar.gz |
* hooks.c (scm_c_hook_add): Fixed bug in append mode.
* environments.c (obarray_enter, obarray_retrieve, obarray_remove,
leaf_environment_fold, obarray_remove_all): Use hashtable
accessors.
* gc.c (scm_init_storage): Moved hook initialization to
scm_storage_prehistory.
(scm_storage_prehistory): New function.
(scm_igc): Added commentary about placement of
scm_after_sweep_c_hook.
* gc-mark.c (scm_mark_all): Use hashtable accessors.
(scm_gc_mark_dependencies): Use SCM_WVECT_WEAK_KEY_P and
SCM_WVECT_WEAK_VALUE_P.
* hashtab.c, hashtab.h (scm_hash_for_each, scm_hash_map): New
functions.
(scm_vector_to_hash_table, scm_c_make_resizing_hash_table):
Removed.
(scm_make_weak_key_hash_table, scm_make_weak_value_hash_table,
scm_make_doubly_weak_hash_table): Moved here from weaks.c.
* init.c (scm_init_guile_1): Removed call to scm_init_weaks; Added
calls to scm_storage_prehistory and scm_hashtab_prehistory.
* modules.c (module-reverse-lookup): Use hashtable accessors.
* symbols.c, symbols.h (scm_i_hash_symbol): New function.
* weaks.c, weaks.h (scm_make_weak_key_alist_vector,
scm_make_weak_value_alist_vector,
scm_make_doubly_weak_alist_vector): New functions.
* weaks.c (scm_init_weaks_builtins): New function.
* weaks.h (SCM_WVECTF_WEAK_KEY, SCM_WVECTF_WEAK_VALUE,
SCM_WVECTF_NOSCAN, SCM_WVECT_WEAK_KEY_P, SCM_WVECT_WEAK_VALUE_P,
SCM_WVECT_NOSCAN_P): New macros.
* weaks.c (scm_scan_weak_vectors): Use SCM_WVECT_WEAK_KEY_P
and SCM_WVECT_WEAK_VALUE_P.
* weaks.c, weaks.h (scm_i_allocate_weak_vector): Renamed from
allocate_weak_vector and exported.
* Makefile.am (ice9_sources): Added weak-vector.scm.
* weak-vector.scm: New file.
* boot-9.scm (module-clear!): Use hash-clear!.
(module-for-each): Use hash-for-each.
(module-map): Use hash-map.
Diffstat (limited to 'libguile/init.c')
-rw-r--r-- | libguile/init.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/libguile/init.c b/libguile/init.c index cd98511e6..92568c0e3 100644 --- a/libguile/init.c +++ b/libguile/init.c @@ -445,14 +445,18 @@ scm_init_guile_1 (SCM_STACKITEM *base) scm_block_gc = 1; + scm_storage_prehistory (); scm_threads_prehistory (); scm_ports_prehistory (); scm_smob_prehistory (); + scm_hashtab_prehistory (); /* requires storage_prehistory */ scm_tables_prehistory (); #ifdef GUILE_DEBUG_MALLOC scm_debug_malloc_prehistory (); #endif - if (scm_init_storage ()) /* requires threads and smob_prehistory */ + if (scm_init_storage ()) /* requires threads_prehistory, + smob_prehistory and + hashtab_prehistory */ abort (); scm_struct_prehistory (); /* requires storage */ @@ -460,7 +464,7 @@ scm_init_guile_1 (SCM_STACKITEM *base) scm_weaks_prehistory (); /* requires storage */ scm_init_subr_table (); scm_environments_prehistory (); /* requires storage */ - scm_modules_prehistory (); /* requires storage */ + scm_modules_prehistory (); /* requires storage and hash tables */ scm_init_variable (); /* all bindings need variables */ scm_init_continuations (); scm_init_root (); /* requires continuations */ |