diff options
author | Marius Vollmer <mvo@zagadka.de> | 2005-01-02 20:49:04 +0000 |
---|---|---|
committer | Marius Vollmer <mvo@zagadka.de> | 2005-01-02 20:49:04 +0000 |
commit | 4057a3e05afde62a4a5039668d129411958f330a (patch) | |
tree | f7240b20d7c05a0a944bfe7e2672ca9dd66f3cc8 /libguile/environments.c | |
parent | f60539dba44057dbcf6179f30d4f03f44c46f0b6 (diff) | |
download | guile-4057a3e05afde62a4a5039668d129411958f330a.tar.gz |
Use new vector elements API or simple vector API, as appropriate.
Removed SCM_HAVE_ARRAYS ifdefery. Replaced all uses of
SCM_HASHTABLE_BUCKETS with SCM_HASHTABLE_BUCKET.
Diffstat (limited to 'libguile/environments.c')
-rw-r--r-- | libguile/environments.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libguile/environments.c b/libguile/environments.c index dc2d5fee2..9ea4c4e1d 100644 --- a/libguile/environments.c +++ b/libguile/environments.c @@ -509,7 +509,7 @@ obarray_enter (SCM obarray, SCM symbol, SCM data) { size_t hash = scm_i_symbol_hash (symbol) % SCM_HASHTABLE_N_BUCKETS (obarray); SCM entry = scm_cons (symbol, data); - SCM slot = scm_cons (entry, SCM_HASHTABLE_BUCKETS (obarray)[hash]); + SCM slot = scm_cons (entry, SCM_HASHTABLE_BUCKET (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"); @@ -530,7 +530,7 @@ obarray_replace (SCM obarray, SCM symbol, SCM data) SCM lsym; SCM slot; - for (lsym = SCM_HASHTABLE_BUCKETS (obarray)[hash]; + for (lsym = SCM_HASHTABLE_BUCKET (obarray, hash); !scm_is_null (lsym); lsym = SCM_CDR (lsym)) { @@ -542,7 +542,7 @@ obarray_replace (SCM obarray, SCM symbol, SCM data) } } - slot = scm_cons (new_entry, SCM_HASHTABLE_BUCKETS (obarray)[hash]); + slot = scm_cons (new_entry, SCM_HASHTABLE_BUCKET (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"); @@ -560,7 +560,7 @@ obarray_retrieve (SCM obarray, SCM sym) size_t hash = scm_i_symbol_hash (sym) % SCM_HASHTABLE_N_BUCKETS (obarray); SCM lsym; - for (lsym = SCM_HASHTABLE_BUCKETS (obarray)[hash]; + for (lsym = SCM_HASHTABLE_BUCKET (obarray, hash); !scm_is_null (lsym); lsym = SCM_CDR (lsym)) { @@ -581,7 +581,7 @@ static SCM obarray_remove (SCM obarray, SCM sym) { size_t hash = scm_i_symbol_hash (sym) % SCM_HASHTABLE_N_BUCKETS (obarray); - SCM table_entry = SCM_HASHTABLE_BUCKETS (obarray)[hash]; + SCM table_entry = SCM_HASHTABLE_BUCKET (obarray, hash); SCM handle = scm_sloppy_assq (sym, table_entry); if (scm_is_pair (handle)) @@ -634,9 +634,9 @@ struct core_environments_base { #define CORE_ENVIRONMENT_WEAK_OBSERVER_VECTOR(env) \ (CORE_ENVIRONMENTS_BASE (env)->weak_observers) #define CORE_ENVIRONMENT_WEAK_OBSERVERS(env) \ - (SCM_VELTS (CORE_ENVIRONMENT_WEAK_OBSERVER_VECTOR (env)) [0]) + (scm_c_vector_ref (CORE_ENVIRONMENT_WEAK_OBSERVER_VECTOR (env), 0)) #define SCM_SET_CORE_ENVIRONMENT_WEAK_OBSERVERS(env, v) \ - (SCM_VECTOR_SET (CORE_ENVIRONMENT_WEAK_OBSERVER_VECTOR (env), 0, (v))) + (scm_c_vector_set_x (CORE_ENVIRONMENT_WEAK_OBSERVER_VECTOR (env), 0, (v))) @@ -887,7 +887,7 @@ leaf_environment_fold (SCM env, scm_environment_folder proc, SCM data, SCM init) for (i = 0; i < SCM_HASHTABLE_N_BUCKETS (obarray); i++) { SCM l; - for (l = SCM_HASHTABLE_BUCKETS (obarray)[i]; + for (l = SCM_HASHTABLE_BUCKET (obarray, i); !scm_is_null (l); l = SCM_CDR (l)) { |