mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-13 01:20:28 -08:00
Code Issues Projects Releases Wiki Activity

* src/lisp.h (DOHASH): Handle rehashing (bug#68690)

Browse source 
I gave too much credit to the comment, and didn't realize that macro
was used in places that didn't obey the comment.
This macro is getting pretty hideous!
This commit is contained in:
Stefan Monnier 2024-01-24 14:52:09 -05:00
parent 1f3371b46e
commit ad004f10f3
1 changed files with 24 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/lisp.h
View file

@ -2604,20 +2604,30 @@ hash_from_key (struct Lisp_Hash_Table *h, Lisp_Object key)
}
/* Iterate K and V as key and value of valid entries in hash table H.
The body may remove the current entry or alter its value slot, but not
mutate TABLE in any other way. */
#define DOHASH(h, k, v) \
for (Lisp_Object *dohash_##k##_##v##_kv = (h)->key_and_value, \
*dohash_##k##_##v##_end = dohash_##k##_##v##_kv \
+ 2 * HASH_TABLE_SIZE (h), \
k, v; \
dohash_##k##_##v##_kv < dohash_##k##_##v##_end \
&& (k = dohash_##k##_##v##_kv[0], \
v = dohash_##k##_##v##_kv[1], /*maybe unsed*/ (void)v, \
true); \
dohash_##k##_##v##_kv += 2) \
if (hash_unused_entry_key_p (k)) \
; \
The body may mutate the hash-table. */
#define DOHASH(h, k, v) \
for (Lisp_Object *dohash_##k##_##v##_base = (h)->key_and_value, \
*dohash_##k##_##v##_kv = dohash_##k##_##v##_base, \
*dohash_##k##_##v##_end = dohash_##k##_##v##_base \
+ 2 * HASH_TABLE_SIZE (h), \
k, v; \
dohash_##k##_##v##_kv < dohash_##k##_##v##_end \
&& (dohash_##k##_##v##_base == (h)->key_and_value \
/* The `key_and_value` table has been reallocated! */ \
|| (dohash_##k##_##v##_kv \
= (dohash_##k##_##v##_kv - dohash_##k##_##v##_base) \
+ (h)->key_and_value, \
dohash_##k##_##v##_base = (h)->key_and_value, \
dohash_##k##_##v##_end = dohash_##k##_##v##_base \
+ 2 * HASH_TABLE_SIZE (h), \
/* Check again, in case the table has shrunk. */ \
dohash_##k##_##v##_kv < dohash_##k##_##v##_end)) \
&& (k = dohash_##k##_##v##_kv[0], \
v = dohash_##k##_##v##_kv[1], /*maybe unused*/ (void)v, \
true); \
dohash_##k##_##v##_kv += 2) \
if (hash_unused_entry_key_p (k)) \
; \
else