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.h | |
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.h')
-rw-r--r-- | libguile/weaks.h | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/libguile/weaks.h b/libguile/weaks.h index 690ba6c41..31c87099a 100644 --- a/libguile/weaks.h +++ b/libguile/weaks.h @@ -3,7 +3,7 @@ #ifndef SCM_WEAKS_H #define SCM_WEAKS_H -/* Copyright (C) 1995,1996,2000,2001 Free Software Foundation, Inc. +/* Copyright (C) 1995,1996,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 @@ -50,9 +50,16 @@ +#define SCM_WVECTF_WEAK_KEY 1 +#define SCM_WVECTF_WEAK_VALUE 2 +#define SCM_WVECTF_NOSCAN 4 + #define SCM_WVECTP(x) (!SCM_IMP (x) && SCM_TYP7 (x) == scm_tc7_wvect) #define SCM_WVECT_TYPE(x) (SCM_CELL_WORD_2 (x)) #define SCM_SET_WVECT_TYPE(x, t) (SCM_SET_CELL_WORD_2 ((x), (t))) +#define SCM_WVECT_WEAK_KEY_P(x) (SCM_WVECT_TYPE (x) & SCM_WVECTF_WEAK_KEY) +#define SCM_WVECT_WEAK_VALUE_P(x) (SCM_WVECT_TYPE (x) & SCM_WVECTF_WEAK_VALUE) +#define SCM_WVECT_NOSCAN_P(x) (SCM_WVECT_TYPE (x) & SCM_WVECTF_NOSCAN) #define SCM_IS_WHVEC(X) (SCM_WVECT_TYPE (X) == 1) #define SCM_IS_WHVEC_V(X) (SCM_WVECT_TYPE (X) == 2) #define SCM_IS_WHVEC_B(X) (SCM_WVECT_TYPE (X) == 3) @@ -64,16 +71,18 @@ SCM_API SCM scm_weak_vectors; +SCM_API SCM scm_i_allocate_weak_vector (scm_t_bits type, SCM size, SCM fill, const char* caller); SCM_API SCM scm_make_weak_vector (SCM k, SCM fill); SCM_API SCM scm_weak_vector (SCM l); SCM_API SCM scm_weak_vector_p (SCM x); -SCM_API SCM scm_make_weak_key_hash_table (SCM k); -SCM_API SCM scm_make_weak_value_hash_table (SCM k); -SCM_API SCM scm_make_doubly_weak_hash_table (SCM k); -SCM_API SCM scm_weak_key_hash_table_p (SCM x); -SCM_API SCM scm_weak_value_hash_table_p (SCM x); -SCM_API SCM scm_doubly_weak_hash_table_p (SCM x); +SCM_API SCM scm_make_weak_key_alist_vector (SCM k); +SCM_API SCM scm_make_weak_value_alist_vector (SCM k); +SCM_API SCM scm_make_doubly_weak_alist_vector (SCM k); +SCM_API SCM scm_weak_key_alist_vector_p (SCM x); +SCM_API SCM scm_weak_value_alist_vector_p (SCM x); +SCM_API SCM scm_doubly_weak_alist_vector_p (SCM x); SCM_API void scm_weaks_prehistory (void); +SCM_API SCM scm_init_weaks_builtins (void); SCM_API void scm_init_weaks (void); #endif /* SCM_WEAKS_H */ |