diff options
author | Greg J. Badros <gjb@cs.washington.edu> | 2000-03-02 20:54:43 +0000 |
---|---|---|
committer | Greg J. Badros <gjb@cs.washington.edu> | 2000-03-02 20:54:43 +0000 |
commit | 7866a09b5b355ea277d2dd780b24e98f647329d4 (patch) | |
tree | 475d3833314d66222ba9773505eec1f0af7d3b01 /libguile/hashtab.h | |
parent | e510ed373f315ca26f17be1ebe963c5c226a158e (diff) | |
download | guile-7866a09b5b355ea277d2dd780b24e98f647329d4.tar.gz |
* list.c: Moved append docs to append! Thanks Dirk Hermann. Also,
added append docs from R4RS.
* strings.c: Docstring typo fix, + eliminate unneeded IMP tests.
Thanks Dirk Hermann!
* chars.h: Provide SCM_CHARP, SCM_CHAR, SCM_MAKE_CHAR and
deprecate SCM_ICHRP, SCM_ICHR, SCM_MAKICHR. Thanks Dirk Hermann!
* *.h, *.c: Use SCM_CHARP, SCM_CHAR, SCM_MAKE_CHAR throughout.
Drop use of SCM_P for function prototypes... assume an ANSI C
compiler. Thanks Dirk Hermann!
Diffstat (limited to 'libguile/hashtab.h')
-rw-r--r-- | libguile/hashtab.h | 62 |
1 files changed, 31 insertions, 31 deletions
diff --git a/libguile/hashtab.h b/libguile/hashtab.h index 9744fcf53..46fd91511 100644 --- a/libguile/hashtab.h +++ b/libguile/hashtab.h @@ -48,39 +48,39 @@ #if 0 -typedef unsigned int scm_hash_fn_t SCM_P ((SCM obj, unsigned int d, void *closure)); -typedef SCM scm_assoc_fn_t SCM_P ((SCM key, SCM alist, void *closure)); -typedef SCM scm_delete_fn_t SCM_P ((SCM elt, SCM list)); +typedef unsigned int scm_hash_fn_t (SCM obj, unsigned int d, void *closure); +typedef SCM scm_assoc_fn_t (SCM key, SCM alist, void *closure); +typedef SCM scm_delete_fn_t (SCM elt, SCM list); #endif -extern SCM scm_hash_fn_get_handle SCM_P ((SCM table, SCM obj, unsigned int (*hash_fn) (), SCM (*assoc_fn) (), void * closure)); -extern SCM scm_hash_fn_create_handle_x SCM_P ((SCM table, SCM obj, SCM init, unsigned int (*hash_fn) (), SCM (*assoc_fn) (), void * closure)); -extern SCM scm_hash_fn_ref SCM_P ((SCM table, SCM obj, SCM dflt, unsigned int (*hash_fn) (), SCM (*assoc_fn) (), void * closure)); -extern SCM scm_hash_fn_set_x SCM_P ((SCM table, SCM obj, SCM val, unsigned int (*hash_fn) (), SCM (*assoc_fn) (), void * closure)); -extern SCM scm_hash_fn_remove_x SCM_P ((SCM table, SCM obj, unsigned int (*hash_fn) (), SCM (*assoc_fn) (), SCM (*delete_fn) (), void * closure)); -extern SCM scm_internal_hash_fold SCM_P ((SCM (*fn) (), void *closure, SCM init, SCM table)); +extern SCM scm_hash_fn_get_handle (SCM table, SCM obj, unsigned int (*hash_fn) (), SCM (*assoc_fn) (), void * closure); +extern SCM scm_hash_fn_create_handle_x (SCM table, SCM obj, SCM init, unsigned int (*hash_fn) (), SCM (*assoc_fn) (), void * closure); +extern SCM scm_hash_fn_ref (SCM table, SCM obj, SCM dflt, unsigned int (*hash_fn) (), SCM (*assoc_fn) (), void * closure); +extern SCM scm_hash_fn_set_x (SCM table, SCM obj, SCM val, unsigned int (*hash_fn) (), SCM (*assoc_fn) (), void * closure); +extern SCM scm_hash_fn_remove_x (SCM table, SCM obj, unsigned int (*hash_fn) (), SCM (*assoc_fn) (), SCM (*delete_fn) (), void * closure); +extern SCM scm_internal_hash_fold (SCM (*fn) (), void *closure, SCM init, SCM table); -extern SCM scm_hashq_get_handle SCM_P ((SCM table, SCM obj)); -extern SCM scm_hashq_create_handle_x SCM_P ((SCM table, SCM obj, SCM init)); -extern SCM scm_hashq_ref SCM_P ((SCM table, SCM obj, SCM dflt)); -extern SCM scm_hashq_set_x SCM_P ((SCM table, SCM obj, SCM val)); -extern SCM scm_hashq_remove_x SCM_P ((SCM table, SCM obj)); -extern SCM scm_hashv_get_handle SCM_P ((SCM table, SCM obj)); -extern SCM scm_hashv_create_handle_x SCM_P ((SCM table, SCM obj, SCM init)); -extern SCM scm_hashv_ref SCM_P ((SCM table, SCM obj, SCM dflt)); -extern SCM scm_hashv_set_x SCM_P ((SCM table, SCM obj, SCM val)); -extern SCM scm_hashv_remove_x SCM_P ((SCM table, SCM obj)); -extern SCM scm_hash_get_handle SCM_P ((SCM table, SCM obj)); -extern SCM scm_hash_create_handle_x SCM_P ((SCM table, SCM obj, SCM init)); -extern SCM scm_hash_ref SCM_P ((SCM table, SCM obj, SCM dflt)); -extern SCM scm_hash_set_x SCM_P ((SCM table, SCM obj, SCM val)); -extern SCM scm_hash_remove_x SCM_P ((SCM table, SCM obj)); -extern SCM scm_hashx_get_handle SCM_P ((SCM hash, SCM assoc, SCM table, SCM obj)); -extern SCM scm_hashx_create_handle_x SCM_P ((SCM hash, SCM assoc, SCM table, SCM obj, SCM init)); -extern SCM scm_hashx_ref SCM_P ((SCM hash, SCM assoc, SCM table, SCM obj, SCM dflt)); -extern SCM scm_hashx_set_x SCM_P ((SCM hash, SCM assoc, SCM table, SCM obj, SCM val)); -extern SCM scm_hashx_remove_x SCM_P ((SCM hash, SCM assoc, SCM del, SCM table, SCM obj)); -extern SCM scm_hash_fold SCM_P ((SCM proc, SCM init, SCM hash)); -extern void scm_init_hashtab SCM_P ((void)); +extern SCM scm_hashq_get_handle (SCM table, SCM obj); +extern SCM scm_hashq_create_handle_x (SCM table, SCM obj, SCM init); +extern SCM scm_hashq_ref (SCM table, SCM obj, SCM dflt); +extern SCM scm_hashq_set_x (SCM table, SCM obj, SCM val); +extern SCM scm_hashq_remove_x (SCM table, SCM obj); +extern SCM scm_hashv_get_handle (SCM table, SCM obj); +extern SCM scm_hashv_create_handle_x (SCM table, SCM obj, SCM init); +extern SCM scm_hashv_ref (SCM table, SCM obj, SCM dflt); +extern SCM scm_hashv_set_x (SCM table, SCM obj, SCM val); +extern SCM scm_hashv_remove_x (SCM table, SCM obj); +extern SCM scm_hash_get_handle (SCM table, SCM obj); +extern SCM scm_hash_create_handle_x (SCM table, SCM obj, SCM init); +extern SCM scm_hash_ref (SCM table, SCM obj, SCM dflt); +extern SCM scm_hash_set_x (SCM table, SCM obj, SCM val); +extern SCM scm_hash_remove_x (SCM table, SCM obj); +extern SCM scm_hashx_get_handle (SCM hash, SCM assoc, SCM table, SCM obj); +extern SCM scm_hashx_create_handle_x (SCM hash, SCM assoc, SCM table, SCM obj, SCM init); +extern SCM scm_hashx_ref (SCM hash, SCM assoc, SCM table, SCM obj, SCM dflt); +extern SCM scm_hashx_set_x (SCM hash, SCM assoc, SCM table, SCM obj, SCM val); +extern SCM scm_hashx_remove_x (SCM hash, SCM assoc, SCM del, SCM table, SCM obj); +extern SCM scm_hash_fold (SCM proc, SCM init, SCM hash); +extern void scm_init_hashtab (void); #endif /* HASHTABH */ |