diff options
author | Andy Wingo <wingo@pobox.com> | 2011-05-01 20:30:54 +0200 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2011-05-01 20:55:50 +0200 |
commit | d1c4720ca382c5588a52108326343eaaab9063ca (patch) | |
tree | c583262003f9e3c78c91be7d49f09f1469289b5f /libguile/srcprop.h | |
parent | ecc9d1b547b21830f5ce4f1eaceb6b9dde44e5dc (diff) | |
download | guile-d1c4720ca382c5588a52108326343eaaab9063ca.tar.gz |
deprecate scm_whash API
* libguile/deprecated.h:
* libguile/deprecated.c (scm_whash_get_handle, SCM_WHASHFOUNDP)
(SCM_WHASHREF, SCM_WHASHSET, scm_whash_create_handle)
(scm_whash_lookup, scm_whash_insert): Deprecate this API.
* libguile/srcprop.c:
* libguile/srcprop.h:
* libguile/read.c (scm_read_sexp): Use the hashq API instead of the
whash API.
Diffstat (limited to 'libguile/srcprop.h')
-rw-r--r-- | libguile/srcprop.h | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/libguile/srcprop.h b/libguile/srcprop.h index 99b848244..5c9ccb960 100644 --- a/libguile/srcprop.h +++ b/libguile/srcprop.h @@ -3,7 +3,7 @@ #ifndef SCM_SRCPROP_H #define SCM_SRCPROP_H -/* Copyright (C) 1995,1996,2000,2001, 2006, 2008, 2009, 2010 Free Software Foundation, Inc. +/* Copyright (C) 1995,1996,2000,2001, 2006, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License @@ -27,30 +27,6 @@ -/* {The old whash table interface} - * *fixme* This is a temporary solution until weak hash table access - * has been optimized for speed (which is quite necessary, if they are - * used for recording of source code positions...) - */ - -#define scm_whash_handle SCM - -#define scm_whash_get_handle(whash, key) \ - scm_hashq_get_handle ((whash), (key)) -#define SCM_WHASHFOUNDP(h) (scm_is_true (h)) -#define SCM_WHASHREF(whash, handle) SCM_CDR (handle) -#define SCM_WHASHSET(whash, handle, obj) SCM_SETCDR (handle, obj) -#define scm_whash_create_handle(whash, key) \ - scm_hashq_create_handle_x ((whash), (key), SCM_UNSPECIFIED) -#define scm_whash_lookup(whash, obj) \ - scm_hashq_ref ((whash), (obj), SCM_BOOL_F) -#define scm_whash_insert(whash, key, obj) \ -do { \ - register SCM w = (whash); \ - SCM_WHASHSET (w, scm_whash_create_handle (w, key), obj); \ -} while (0) - - /* {Source properties} */ #define SCM_PROCTRACEP(x) (scm_is_true (scm_procedure_property (x, scm_sym_trace))) |