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/environments.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/environments.c')
-rw-r--r-- | libguile/environments.c | 48 |
1 files changed, 30 insertions, 18 deletions
diff --git a/libguile/environments.c b/libguile/environments.c index fadfbc6de..074c49cd2 100644 --- a/libguile/environments.c +++ b/libguile/environments.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1999,2000,2001 Free Software Foundation, Inc. +/* Copyright (C) 1999,2000,2001, 2003 Free Software Foundation, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -531,10 +531,12 @@ observer_print (SCM type, SCM port, scm_print_state *pstate SCM_UNUSED) static SCM obarray_enter (SCM obarray, SCM symbol, SCM data) { - size_t hash = SCM_SYMBOL_HASH (symbol) % SCM_VECTOR_LENGTH (obarray); + size_t hash = SCM_SYMBOL_HASH (symbol) % SCM_HASHTABLE_N_BUCKETS (obarray); SCM entry = scm_cons (symbol, data); - SCM slot = scm_cons (entry, SCM_VELTS (obarray)[hash]); - SCM_VECTOR_SET (obarray, hash, slot); + SCM slot = scm_cons (entry, SCM_HASHTABLE_BUCKETS (obarray)[hash]); + SCM_SET_HASHTABLE_BUCKET (obarray, hash, slot); + if (SCM_HASHTABLE_N_ITEMS (obarray) > SCM_HASHTABLE_UPPER (obarray)) + scm_i_rehash (obarray, scm_i_hash_symbol, 0, "obarray_enter"); return entry; } @@ -547,12 +549,14 @@ obarray_enter (SCM obarray, SCM symbol, SCM data) static SCM obarray_replace (SCM obarray, SCM symbol, SCM data) { - size_t hash = SCM_SYMBOL_HASH (symbol) % SCM_VECTOR_LENGTH (obarray); + size_t hash = SCM_SYMBOL_HASH (symbol) % SCM_HASHTABLE_N_BUCKETS (obarray); SCM new_entry = scm_cons (symbol, data); SCM lsym; SCM slot; - for (lsym = SCM_VELTS (obarray)[hash]; !SCM_NULLP (lsym); lsym = SCM_CDR (lsym)) + for (lsym = SCM_HASHTABLE_BUCKETS (obarray)[hash]; + !SCM_NULLP (lsym); + lsym = SCM_CDR (lsym)) { SCM old_entry = SCM_CAR (lsym); if (SCM_EQ_P (SCM_CAR (old_entry), symbol)) @@ -562,8 +566,10 @@ obarray_replace (SCM obarray, SCM symbol, SCM data) } } - slot = scm_cons (new_entry, SCM_VELTS (obarray)[hash]); - SCM_VECTOR_SET (obarray, hash, slot); + slot = scm_cons (new_entry, SCM_HASHTABLE_BUCKETS (obarray)[hash]); + SCM_SET_HASHTABLE_BUCKET (obarray, hash, slot); + if (SCM_HASHTABLE_N_ITEMS (obarray) > SCM_HASHTABLE_UPPER (obarray)) + scm_i_rehash (obarray, scm_i_hash_symbol, 0, "obarray_replace"); return SCM_BOOL_F; } @@ -575,10 +581,12 @@ obarray_replace (SCM obarray, SCM symbol, SCM data) static SCM obarray_retrieve (SCM obarray, SCM sym) { - size_t hash = SCM_SYMBOL_HASH (sym) % SCM_VECTOR_LENGTH (obarray); + size_t hash = SCM_SYMBOL_HASH (sym) % SCM_HASHTABLE_N_BUCKETS (obarray); SCM lsym; - for (lsym = SCM_VELTS (obarray)[hash]; !SCM_NULLP (lsym); lsym = SCM_CDR (lsym)) + for (lsym = SCM_HASHTABLE_BUCKETS (obarray)[hash]; + !SCM_NULLP (lsym); + lsym = SCM_CDR (lsym)) { SCM entry = SCM_CAR (lsym); if (SCM_EQ_P (SCM_CAR (entry), sym)) @@ -596,14 +604,15 @@ obarray_retrieve (SCM obarray, SCM sym) static SCM obarray_remove (SCM obarray, SCM sym) { - size_t hash = SCM_SYMBOL_HASH (sym) % SCM_VECTOR_LENGTH (obarray); - SCM table_entry = SCM_VELTS (obarray)[hash]; + size_t hash = SCM_SYMBOL_HASH (sym) % SCM_HASHTABLE_N_BUCKETS (obarray); + SCM table_entry = SCM_HASHTABLE_BUCKETS (obarray)[hash]; SCM handle = scm_sloppy_assq (sym, table_entry); if (SCM_CONSP (handle)) { SCM new_table_entry = scm_delq1_x (handle, table_entry); - SCM_VECTOR_SET (obarray, hash, new_table_entry); + SCM_SET_HASHTABLE_BUCKET (obarray, hash, new_table_entry); + SCM_HASHTABLE_DECREMENT (obarray); } return handle; @@ -613,13 +622,14 @@ obarray_remove (SCM obarray, SCM sym) static void obarray_remove_all (SCM obarray) { - size_t size = SCM_VECTOR_LENGTH (obarray); + size_t size = SCM_HASHTABLE_N_BUCKETS (obarray); size_t i; for (i = 0; i < size; i++) { - SCM_VECTOR_SET (obarray, i, SCM_EOL); + SCM_SET_HASHTABLE_BUCKET (obarray, i, SCM_EOL); } + SCM_SET_HASHTABLE_N_ITEMS (obarray, 0); } @@ -759,7 +769,7 @@ core_environments_init (struct core_environments_base *body, { body->funcs = funcs; body->observers = SCM_EOL; - body->weak_observers = scm_make_weak_value_hash_table (SCM_MAKINUM (1)); + body->weak_observers = scm_make_weak_value_alist_vector (SCM_MAKINUM (1)); } @@ -897,10 +907,12 @@ leaf_environment_fold (SCM env, scm_environment_folder proc, SCM data, SCM init) SCM result = init; SCM obarray = LEAF_ENVIRONMENT (env)->obarray; - for (i = 0; i < SCM_VECTOR_LENGTH (obarray); i++) + for (i = 0; i < SCM_HASHTABLE_N_BUCKETS (obarray); i++) { SCM l; - for (l = SCM_VELTS (obarray)[i]; !SCM_NULLP (l); l = SCM_CDR (l)) + for (l = SCM_HASHTABLE_BUCKETS (obarray)[i]; + !SCM_NULLP (l); + l = SCM_CDR (l)) { SCM binding = SCM_CAR (l); SCM symbol = SCM_CAR (binding); |