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/weaks.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/weaks.c')
-rw-r--r-- | libguile/weaks.c | 84 |
1 files changed, 47 insertions, 37 deletions
diff --git a/libguile/weaks.c b/libguile/weaks.c index 7f02d3c68..a39b587ff 100644 --- a/libguile/weaks.c +++ b/libguile/weaks.c @@ -52,6 +52,16 @@ +/* 1. The current hash table implementation in hashtab.c uses weak alist + * vectors (formerly called weak hash tables) internally. + * + * 2. All hash table operations still work on alist vectors. + * + * 3. The weak vector and alist vector Scheme API is accessed through + * the module (ice-9 weak-vector). + */ + + /* {Weak Vectors} */ @@ -61,8 +71,8 @@ * elements which are initialized with the 'fill' object, or, if 'fill' is * undefined, with an unspecified object. */ -static SCM -allocate_weak_vector (scm_t_bits type, SCM size, SCM fill, const char* caller) +SCM +scm_i_allocate_weak_vector (scm_t_bits type, SCM size, SCM fill, const char* caller) #define FUNC_NAME caller { if (SCM_INUMP (size)) @@ -108,7 +118,6 @@ allocate_weak_vector (scm_t_bits type, SCM size, SCM fill, const char* caller) } #undef FUNC_NAME - SCM_DEFINE (scm_make_weak_vector, "make-weak-vector", 1, 1, 0, (SCM size, SCM fill), "Return a weak vector with @var{size} elements. If the optional\n" @@ -117,7 +126,7 @@ SCM_DEFINE (scm_make_weak_vector, "make-weak-vector", 1, 1, 0, "empty list.") #define FUNC_NAME s_scm_make_weak_vector { - return allocate_weak_vector (0, size, fill, FUNC_NAME); + return scm_i_allocate_weak_vector (0, size, fill, FUNC_NAME); } #undef FUNC_NAME @@ -170,85 +179,76 @@ SCM_DEFINE (scm_weak_vector_p, "weak-vector?", 1, 0, 0, -SCM_DEFINE (scm_make_weak_key_hash_table, "make-weak-key-hash-table", 0, 1, 0, +SCM_DEFINE (scm_make_weak_key_alist_vector, "make-weak-key-alist-vector", 0, 1, 0, (SCM size), - "@deffnx {Scheme Procedure} make-weak-value-hash-table size\n" - "@deffnx {Scheme Procedure} make-doubly-weak-hash-table size\n" + "@deffnx {Scheme Procedure} make-weak-value-alist-vector size\n" + "@deffnx {Scheme Procedure} make-doubly-weak-alist-vector size\n" "Return a weak hash table with @var{size} buckets. As with any\n" "hash table, choosing a good size for the table requires some\n" "caution.\n" "\n" "You can modify weak hash tables in exactly the same way you\n" "would modify regular hash tables. (@pxref{Hash Tables})") -#define FUNC_NAME s_scm_make_weak_key_hash_table +#define FUNC_NAME s_scm_make_weak_key_alist_vector { - if (SCM_UNBNDP (size)) - return scm_vector_to_hash_table (allocate_weak_vector (1, SCM_MAKINUM (31), - SCM_EOL, FUNC_NAME)); - else - return allocate_weak_vector (1, size, SCM_EOL, FUNC_NAME); + return scm_i_allocate_weak_vector + (1, SCM_UNBNDP (size) ? SCM_MAKINUM (31) : size, SCM_EOL, FUNC_NAME); } #undef FUNC_NAME -SCM_DEFINE (scm_make_weak_value_hash_table, "make-weak-value-hash-table", 0, 1, 0, +SCM_DEFINE (scm_make_weak_value_alist_vector, "make-weak-value-alist-vector", 0, 1, 0, (SCM size), "Return a hash table with weak values with @var{size} buckets.\n" "(@pxref{Hash Tables})") -#define FUNC_NAME s_scm_make_weak_value_hash_table +#define FUNC_NAME s_scm_make_weak_value_alist_vector { - if (SCM_UNBNDP (size)) - return scm_vector_to_hash_table (allocate_weak_vector (2, SCM_MAKINUM (31), - SCM_EOL, FUNC_NAME)); - else - return allocate_weak_vector (2, size, SCM_EOL, FUNC_NAME); + return scm_i_allocate_weak_vector + (2, SCM_UNBNDP (size) ? SCM_MAKINUM (31) : size, SCM_EOL, FUNC_NAME); } #undef FUNC_NAME -SCM_DEFINE (scm_make_doubly_weak_hash_table, "make-doubly-weak-hash-table", 1, 0, 0, +SCM_DEFINE (scm_make_doubly_weak_alist_vector, "make-doubly-weak-alist-vector", 1, 0, 0, (SCM size), "Return a hash table with weak keys and values with @var{size}\n" "buckets. (@pxref{Hash Tables})") -#define FUNC_NAME s_scm_make_doubly_weak_hash_table +#define FUNC_NAME s_scm_make_doubly_weak_alist_vector { - if (SCM_UNBNDP (size)) - return scm_vector_to_hash_table (allocate_weak_vector (3, SCM_MAKINUM (31), - SCM_EOL, FUNC_NAME)); - else - return allocate_weak_vector (3, size, SCM_EOL, FUNC_NAME); + return scm_i_allocate_weak_vector + (3, SCM_UNBNDP (size) ? SCM_MAKINUM (31) : size, SCM_EOL, FUNC_NAME); } #undef FUNC_NAME -SCM_DEFINE (scm_weak_key_hash_table_p, "weak-key-hash-table?", 1, 0, 0, +SCM_DEFINE (scm_weak_key_alist_vector_p, "weak-key-alist-vector?", 1, 0, 0, (SCM obj), - "@deffnx {Scheme Procedure} weak-value-hash-table? obj\n" - "@deffnx {Scheme Procedure} doubly-weak-hash-table? obj\n" + "@deffnx {Scheme Procedure} weak-value-alist-vector? obj\n" + "@deffnx {Scheme Procedure} doubly-weak-alist-vector? obj\n" "Return @code{#t} if @var{obj} is the specified weak hash\n" "table. Note that a doubly weak hash table is neither a weak key\n" "nor a weak value hash table.") -#define FUNC_NAME s_scm_weak_key_hash_table_p +#define FUNC_NAME s_scm_weak_key_alist_vector_p { return SCM_BOOL (SCM_WVECTP (obj) && SCM_IS_WHVEC (obj)); } #undef FUNC_NAME -SCM_DEFINE (scm_weak_value_hash_table_p, "weak-value-hash-table?", 1, 0, 0, +SCM_DEFINE (scm_weak_value_alist_vector_p, "weak-value-alist-vector?", 1, 0, 0, (SCM obj), "Return @code{#t} if @var{obj} is a weak value hash table.") -#define FUNC_NAME s_scm_weak_value_hash_table_p +#define FUNC_NAME s_scm_weak_value_alist_vector_p { return SCM_BOOL (SCM_WVECTP (obj) && SCM_IS_WHVEC_V (obj)); } #undef FUNC_NAME -SCM_DEFINE (scm_doubly_weak_hash_table_p, "doubly-weak-hash-table?", 1, 0, 0, +SCM_DEFINE (scm_doubly_weak_alist_vector_p, "doubly-weak-alist-vector?", 1, 0, 0, (SCM obj), "Return @code{#t} if @var{obj} is a doubly weak hash table.") -#define FUNC_NAME s_scm_doubly_weak_hash_table_p +#define FUNC_NAME s_scm_doubly_weak_alist_vector_p { return SCM_BOOL (SCM_WVECTP (obj) && SCM_IS_WHVEC_B (obj)); } @@ -325,7 +325,9 @@ scm_scan_weak_vectors (void *dummy1 SCM_UNUSED, if (UNMARKED_CELL_P (ptr[j])) ptr[j] = SCM_BOOL_F; } - else /* if (SCM_IS_WHVEC_ANY (scm_weak_vectors[i])) */ + /* check if we should scan the alist vector here (hashtables + have their own scan function in hashtab.c). */ + else if (!SCM_WVECT_NOSCAN_P (w)) { SCM obj = w; register long n = SCM_VECTOR_LENGTH (w); @@ -378,10 +380,18 @@ scm_weaks_prehistory () } +SCM +scm_init_weaks_builtins () +{ +#include "libguile/weaks.x" + return SCM_UNSPECIFIED; +} + void scm_init_weaks () { -#include "libguile/weaks.x" + scm_c_define_gsubr ("%init-weaks-builtins", 0, 0, 0, + scm_init_weaks_builtins); } |