mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-20 02:30:23 +02:00
Code Activity

hash-set! on weak tables returns the value

Browse source 
* libguile/weak-table.h:
* libguile/weak-table.c (scm_weak_table_putq_x)
  (scm_weak_table_remq_x, scm_weak_table_clear_x)
  (scm_weak_table_for_each): Declare these as returning void instead of
  SCM.
* libguile/hashtab.c (scm_hashq_set_x, scm_hashq_remove_x)
  (scm_hashv_set_x, scm_hashv_remove_x)
  (scm_hash_set_x, scm_hash_remove_x)
  (scm_hashx_set_x, scm_hashx_remove_x):
  (scm_hash_for_each): For weak tables, have the set! functions return
  the values, as they used to do.  Have remove! functions return #f,
  indicating the lack of a handle.  Shim around for-each to return
  unspecified, even though that wasn't yet a problem.

* test-suite/tests/weaks.test: Add a test.
This commit is contained in:
Andy Wingo 2012-03-02 18:26:56 +01:00
parent dee4e3ee3c
commit 07e69928fc
4 changed files with 47 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

14
libguile/weak-table.c
View file

@ -971,24 +971,22 @@ scm_weak_table_refq (SCM table, SCM key, SCM dflt)
dflt);
}
SCM
void
scm_weak_table_putq_x (SCM table, SCM key, SCM value)
{
scm_c_weak_table_put_x (table, scm_ihashq (key, -1),
assq_predicate, SCM_UNPACK_POINTER (key),
key, value);
return SCM_UNSPECIFIED;
}
SCM
void
scm_weak_table_remq_x (SCM table, SCM key)
{
scm_c_weak_table_remove_x (table, scm_ihashq (key, -1),
assq_predicate, SCM_UNPACK_POINTER (key));
return SCM_UNSPECIFIED;
}
SCM
void
scm_weak_table_clear_x (SCM table)
#define FUNC_NAME "weak-table-clear!"
{
@ -1004,8 +1002,6 @@ scm_weak_table_clear_x (SCM table)
t->n_items = 0;
scm_i_pthread_mutex_unlock (&t->lock);
return SCM_UNSPECIFIED;
}
#undef FUNC_NAME
@ -1073,7 +1069,7 @@ for_each_trampoline (void *closure, SCM k, SCM v, SCM seed)
return seed;
}
SCM
void
scm_weak_table_for_each (SCM proc, SCM table)
#define FUNC_NAME "weak-table-for-each"
{
@ -1081,8 +1077,6 @@ scm_weak_table_for_each (SCM proc, SCM table)
SCM_VALIDATE_PROC (1, proc);
scm_c_weak_table_fold (for_each_trampoline, SCM_UNPACK_POINTER (proc), SCM_BOOL_F, table);
return SCM_UNSPECIFIED;
}
#undef FUNC_NAME