Mercurial > hg > xemacs-beta
annotate src/elhash.c @ 5537:2df2d9171f20
Suppress a "shadowed local" warning.
| author | Stephen J. Turnbull <stephen@xemacs.org> |
|---|---|
| date | Mon, 08 Aug 2011 13:57:18 +0900 |
| parents | 05c1ad4f7a7b |
| children | 58b38d5b32d0 |
| rev | line source |
|---|---|
| 428 | 1 /* Implementation of the hash table lisp object type. |
| 2 Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc. | |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5125
diff
changeset
|
3 Copyright (C) 1995, 1996, 2002, 2004, 2010 Ben Wing. |
| 428 | 4 Copyright (C) 1997 Free Software Foundation, Inc. |
| 5 | |
| 6 This file is part of XEmacs. | |
| 7 | |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5277
diff
changeset
|
8 XEmacs is free software: you can redistribute it and/or modify it |
| 428 | 9 under the terms of the GNU General Public License as published by the |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5277
diff
changeset
|
10 Free Software Foundation, either version 3 of the License, or (at your |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5277
diff
changeset
|
11 option) any later version. |
| 428 | 12 |
| 13 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
|
5232
33899241a6a8
Fix typo in permission notice of elhash.c.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
5222
diff
changeset
|
14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
| 428 | 15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
| 16 for more details. | |
| 17 | |
| 18 You should have received a copy of the GNU General Public License | |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5277
diff
changeset
|
19 along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */ |
| 428 | 20 |
| 21 /* Synched up with: Not in FSF. */ | |
| 22 | |
| 1292 | 23 /* Author: Lost in the mists of history. At least back to Lucid 19.3, |
| 24 circa Sep 1992. Early hash table implementation allowed only `eq' as a | |
| 25 test -- other tests possible only when these objects were created from | |
| 26 the C code. | |
| 27 | |
| 28 Expansion to allow general `equal'-test Lisp-creatable tables, and hash | |
| 29 methods for the various Lisp objects in existence at the time, added | |
| 30 during 19.12 I think (early 1995?), by Ben Wing. | |
| 31 | |
| 32 Weak hash tables added by Jamie (maybe?) early on, perhaps around 19.6, | |
| 33 maybe earlier; again, only possible through the C code, and only | |
| 34 supported fully weak hash tables. Expansion to other kinds of weakness, | |
| 35 and exporting of the interface to Lisp, by Ben Wing during 19.12 | |
| 36 (early-mid 1995) or maybe 19.13 cycle (mid 1995). | |
| 37 | |
| 38 Expansion to full Common Lisp spec and interface, redoing of the | |
| 39 implementation, by Martin Buchholz, 1997? (Former hash table | |
| 40 implementation used "double hashing", I'm pretty sure, and was weirdly | |
| 41 tied into the generic hash.c code. Martin completely separated them.) | |
| 42 */ | |
| 43 | |
| 489 | 44 /* This file implements the hash table lisp object type. |
| 45 | |
| 504 | 46 This implementation was mostly written by Martin Buchholz in 1997. |
| 47 | |
| 48 The Lisp-level API (derived from Common Lisp) is almost completely | |
| 49 compatible with GNU Emacs 21, even though the implementations are | |
| 50 totally independent. | |
| 51 | |
| 489 | 52 The hash table technique used is "linear probing". Collisions are |
| 53 resolved by putting the item in the next empty place in the array | |
| 54 following the collision. Finding a hash entry performs a linear | |
| 55 search in the cluster starting at the hash value. | |
| 56 | |
| 57 On deletions from the hash table, the entries immediately following | |
| 58 the deleted entry are re-entered in the hash table. We do not have | |
| 59 a special way to mark deleted entries (known as "tombstones"). | |
| 60 | |
| 61 At the end of the hash entries ("hentries"), we leave room for an | |
| 62 entry that is always empty (the "sentinel"). | |
| 63 | |
| 64 The traditional literature on hash table implementation | |
| 65 (e.g. Knuth) suggests that too much "primary clustering" occurs | |
| 66 with linear probing. However, this literature was written when | |
| 67 locality of reference was not a factor. The discrepancy between | |
| 68 CPU speeds and memory speeds is increasing, and the speed of access | |
| 69 to memory is highly dependent on memory caches which work best when | |
| 70 there is high locality of data reference. Random access to memory | |
| 71 is up to 20 times as expensive as access to the nearest address | |
| 72 (and getting worse). So linear probing makes sense. | |
| 73 | |
| 74 But the representation doesn't actually matter that much with the | |
| 75 current elisp engine. Funcall is sufficiently slow that the choice | |
| 76 of hash table implementation is noise. */ | |
| 77 | |
| 428 | 78 #include <config.h> |
| 79 #include "lisp.h" | |
| 80 #include "bytecode.h" | |
| 81 #include "elhash.h" | |
|
5169
6c6d78781d59
cleanup of code related to xfree(), better KKCC backtrace capabilities, document XD_INLINE_LISP_OBJECT_BLOCK_PTR, fix some memory leaks, other code cleanup
Ben Wing <ben@xemacs.org>
parents:
5158
diff
changeset
|
82 #include "gc.h" |
| 489 | 83 #include "opaque.h" |
|
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
84 #include "buffer.h" |
| 428 | 85 |
| 86 Lisp_Object Qhash_tablep; | |
|
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
87 Lisp_Object Qeq, Qeql, Qequal, Qequalp; |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
88 Lisp_Object Qeq_hash, Qeql_hash, Qequal_hash, Qequalp_hash; |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
89 |
|
5084
6afe991b8135
Add a PARSE_KEYWORDS macro, use it in #'make-hash-table.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4976
diff
changeset
|
90 static Lisp_Object Qhashtable, Qhash_table, Qmake_hash_table; |
| 442 | 91 static Lisp_Object Qweakness, Qvalue, Qkey_or_value, Qkey_and_value; |
| 428 | 92 static Lisp_Object Vall_weak_hash_tables; |
| 93 static Lisp_Object Qrehash_size, Qrehash_threshold; | |
|
5320
31be2a3d121d
Move Qcount, Q_default, Q_test to general-slots.h; add SYMBOL_KEYWORD_GENERAL()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5307
diff
changeset
|
94 static Lisp_Object Q_size, Q_weakness, Q_rehash_size, Q_rehash_threshold; |
|
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
95 static Lisp_Object Vhash_table_test_eq, Vhash_table_test_eql; |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
96 static Lisp_Object Vhash_table_test_weak_list; |
| 428 | 97 |
| 98 /* obsolete as of 19990901 in xemacs-21.2 */ | |
| 442 | 99 static Lisp_Object Qweak, Qkey_weak, Qvalue_weak, Qkey_or_value_weak; |
|
5222
18c0b5909d16
Use keywords in structure syntax; new #define, NEED_TO_HANDLE_21_4_CODE 1
Aidan Kehoe <kehoea@parhasard.net>
parents:
5193
diff
changeset
|
100 static Lisp_Object Qnon_weak; |
| 428 | 101 |
|
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
102 /* A hash table test, with its associated hash function. equal_function may |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
103 call lisp_equal_function, and hash_function similarly may call |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
104 lisp_hash_function. */ |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
105 struct Hash_Table_Test |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
106 { |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
107 NORMAL_LISP_OBJECT_HEADER header; |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
108 Lisp_Object name; |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
109 hash_table_equal_function_t equal_function; |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
110 hash_table_hash_function_t hash_function; |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
111 Lisp_Object lisp_equal_function; |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
112 Lisp_Object lisp_hash_function; |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
113 }; |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
114 |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
115 static Lisp_Object |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
116 mark_hash_table_test (Lisp_Object obj) |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
117 { |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
118 Hash_Table_Test *http = XHASH_TABLE_TEST (obj); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
119 |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
120 mark_object (http->name); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
121 mark_object (http->lisp_equal_function); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
122 mark_object (http->lisp_hash_function); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
123 |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
124 return Qnil; |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
125 } |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
126 |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
127 static const struct memory_description hash_table_test_description_1[] = |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
128 { |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
129 { XD_LISP_OBJECT, offsetof (struct Hash_Table_Test, name) }, |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
130 { XD_LISP_OBJECT, offsetof (struct Hash_Table_Test, lisp_equal_function) }, |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
131 { XD_LISP_OBJECT, offsetof (struct Hash_Table_Test, lisp_hash_function) }, |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
132 { XD_END } |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
133 }; |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
134 |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
135 static const struct sized_memory_description hash_table_test_description = |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
136 { |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
137 sizeof (struct Hash_Table_Test), |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
138 hash_table_test_description_1 |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
139 }; |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
140 |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
141 DEFINE_DUMPABLE_INTERNAL_LISP_OBJECT ("hash-table-test", hash_table_test, |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
142 mark_hash_table_test, |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
143 hash_table_test_description_1, |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
144 Hash_Table_Test); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
145 /* A hash table. */ |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
146 |
| 428 | 147 struct Lisp_Hash_Table |
| 148 { | |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5125
diff
changeset
|
149 NORMAL_LISP_OBJECT_HEADER header; |
| 665 | 150 Elemcount size; |
| 151 Elemcount count; | |
| 152 Elemcount rehash_count; | |
| 428 | 153 double rehash_size; |
| 154 double rehash_threshold; | |
| 665 | 155 Elemcount golden_ratio; |
| 1204 | 156 htentry *hentries; |
|
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
157 Lisp_Object test; |
| 428 | 158 enum hash_table_weakness weakness; |
| 159 Lisp_Object next_weak; /* Used to chain together all of the weak | |
| 160 hash tables. Don't mark through this. */ | |
| 161 }; | |
| 162 | |
| 1204 | 163 #define CLEAR_HTENTRY(htentry) \ |
| 164 ((*(EMACS_UINT*)(&((htentry)->key))) = 0, \ | |
| 165 (*(EMACS_UINT*)(&((htentry)->value))) = 0) | |
| 428 | 166 |
| 167 #define HASH_TABLE_DEFAULT_SIZE 16 | |
| 168 #define HASH_TABLE_DEFAULT_REHASH_SIZE 1.3 | |
| 169 #define HASH_TABLE_MIN_SIZE 10 | |
|
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
170 #define HASH_TABLE_DEFAULT_REHASH_THRESHOLD(size, test) \ |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
171 (((size) > 4096 && EQ (Vhash_table_test_eq, test)) ? 0.7 : 0.6) |
| 428 | 172 |
|
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
173 #define HASHCODE(key, ht, http) \ |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
174 ((((!EQ (Vhash_table_test_eq, ht->test)) ? \ |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
175 (http)->hash_function (http, key) : \ |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
176 LISP_HASH (key)) * (ht)->golden_ratio) % (ht)->size) |
| 428 | 177 |
|
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
178 #define KEYS_EQUAL_P(key1, key2, test, http) \ |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
179 (EQ (key1, key2) || ((!EQ (Vhash_table_test_eq, test) && \ |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
180 (http->equal_function) (http, key1, key2)))) |
| 428 | 181 |
| 182 #define LINEAR_PROBING_LOOP(probe, entries, size) \ | |
| 183 for (; \ | |
| 1204 | 184 !HTENTRY_CLEAR_P (probe) || \ |
| 428 | 185 (probe == entries + size ? \ |
| 1204 | 186 (probe = entries, !HTENTRY_CLEAR_P (probe)) : 0); \ |
| 428 | 187 probe++) |
| 188 | |
| 800 | 189 #ifdef ERROR_CHECK_STRUCTURES |
| 428 | 190 static void |
| 191 check_hash_table_invariants (Lisp_Hash_Table *ht) | |
| 192 { | |
| 193 assert (ht->count < ht->size); | |
| 194 assert (ht->count <= ht->rehash_count); | |
| 195 assert (ht->rehash_count < ht->size); | |
| 196 assert ((double) ht->count * ht->rehash_threshold - 1 <= (double) ht->rehash_count); | |
| 1204 | 197 assert (HTENTRY_CLEAR_P (ht->hentries + ht->size)); |
| 428 | 198 } |
| 199 #else | |
| 200 #define check_hash_table_invariants(ht) | |
| 201 #endif | |
| 202 | |
| 203 /* Return a suitable size for a hash table, with at least SIZE slots. */ | |
| 665 | 204 static Elemcount |
| 205 hash_table_size (Elemcount requested_size) | |
| 428 | 206 { |
| 207 /* Return some prime near, but greater than or equal to, SIZE. | |
| 208 Decades from the time of writing, someone will have a system large | |
| 209 enough that the list below will be too short... */ | |
| 665 | 210 static const Elemcount primes [] = |
| 428 | 211 { |
| 212 19, 29, 41, 59, 79, 107, 149, 197, 263, 347, 457, 599, 787, 1031, | |
| 213 1361, 1777, 2333, 3037, 3967, 5167, 6719, 8737, 11369, 14783, | |
| 214 19219, 24989, 32491, 42257, 54941, 71429, 92861, 120721, 156941, | |
| 215 204047, 265271, 344857, 448321, 582821, 757693, 985003, 1280519, | |
| 216 1664681, 2164111, 2813353, 3657361, 4754591, 6180989, 8035301, | |
| 217 10445899, 13579681, 17653589, 22949669, 29834603, 38784989, | |
| 218 50420551, 65546729, 85210757, 110774011, 144006217, 187208107, | |
| 219 243370577, 316381771, 411296309, 534685237, 695090819, 903618083, | |
| 647 | 220 1174703521, 1527114613, 1985248999 /* , 2580823717UL, 3355070839UL */ |
| 428 | 221 }; |
| 222 /* We've heard of binary search. */ | |
| 223 int low, high; | |
| 224 for (low = 0, high = countof (primes) - 1; high - low > 1;) | |
| 225 { | |
| 226 /* Loop Invariant: size < primes [high] */ | |
| 227 int mid = (low + high) / 2; | |
| 228 if (primes [mid] < requested_size) | |
| 229 low = mid; | |
| 230 else | |
| 231 high = mid; | |
| 232 } | |
| 233 return primes [high]; | |
| 234 } | |
| 235 | |
| 236 | |
| 237 | |
| 238 static int | |
|
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
239 lisp_object_eql_equal (const Hash_Table_Test *UNUSED (http), Lisp_Object obj1, |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
240 Lisp_Object obj2) |
| 428 | 241 { |
|
4885
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4820
diff
changeset
|
242 return EQ (obj1, obj2) || |
|
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4820
diff
changeset
|
243 (NON_FIXNUM_NUMBER_P (obj1) && internal_equal (obj1, obj2, 0)); |
| 428 | 244 } |
| 245 | |
| 665 | 246 static Hashcode |
|
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
247 lisp_object_eql_hash (const Hash_Table_Test *UNUSED (http), Lisp_Object obj) |
| 428 | 248 { |
|
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
249 return NON_FIXNUM_NUMBER_P (obj) ? |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
250 internal_hash (obj, 0, 0) : LISP_HASH (obj); |
| 428 | 251 } |
| 252 | |
| 253 static int | |
|
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
254 lisp_object_equal_equal (const Hash_Table_Test *UNUSED (http), |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
255 Lisp_Object obj1, Lisp_Object obj2) |
| 428 | 256 { |
| 257 return internal_equal (obj1, obj2, 0); | |
| 258 } | |
| 259 | |
| 665 | 260 static Hashcode |
|
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
261 lisp_object_equal_hash (const Hash_Table_Test *UNUSED (http), Lisp_Object obj) |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
262 { |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
263 return internal_hash (obj, 0, 0); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
264 } |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
265 |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
266 static Hashcode |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
267 lisp_object_equalp_hash (const Hash_Table_Test *UNUSED (http), Lisp_Object obj) |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
268 { |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
269 return internal_hash (obj, 0, 1); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
270 } |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
271 |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
272 static int |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
273 lisp_object_equalp_equal (const Hash_Table_Test *UNUSED (http), |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
274 Lisp_Object obj1, Lisp_Object obj2) |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
275 { |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
276 return internal_equalp (obj1, obj2, 0); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
277 } |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
278 |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
279 static Hashcode |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
280 lisp_object_general_hash (const Hash_Table_Test *http, Lisp_Object obj) |
| 428 | 281 { |
|
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
282 struct gcpro gcpro1; |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
283 Lisp_Object args[2] = { http->lisp_hash_function, obj }, res; |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
284 |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
285 /* Make sure any weakly referenced objects don't get collected before the |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
286 funcall: */ |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
287 GCPRO1 (args[0]); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
288 gcpro1.nvars = countof (args); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
289 res = IGNORE_MULTIPLE_VALUES (Ffuncall (countof (args), args)); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
290 UNGCPRO; |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
291 |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
292 if (INTP (res)) |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
293 { |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
294 return (Hashcode) (XINT (res)); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
295 } |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
296 |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
297 #ifdef HAVE_BIGNUM |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
298 if (BIGNUMP (res)) |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
299 { |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
300 if (bignum_fits_emacs_int_p (XBIGNUM_DATA (res))) |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
301 { |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
302 return (Hashcode) bignum_to_emacs_int (XBIGNUM_DATA (res)); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
303 } |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
304 |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
305 signal_error (Qrange_error, "Not a valid hash code", res); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
306 } |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
307 #endif |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
308 |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
309 dead_wrong_type_argument (Qintegerp, res); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
310 } |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
311 |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
312 static int |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
313 lisp_object_general_equal (const Hash_Table_Test *http, Lisp_Object obj1, |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
314 Lisp_Object obj2) |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
315 { |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
316 struct gcpro gcpro1; |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
317 Lisp_Object args[] = { http->lisp_equal_function, obj1, obj2 }, res; |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
318 |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
319 GCPRO1 (args[0]); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
320 gcpro1.nvars = countof (args); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
321 res = IGNORE_MULTIPLE_VALUES (Ffuncall (countof (args), args)); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
322 UNGCPRO; |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
323 |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
324 return !(NILP (res)); |
| 428 | 325 } |
| 326 | |
| 327 | |
| 328 static Lisp_Object | |
| 329 mark_hash_table (Lisp_Object obj) | |
| 330 { | |
| 331 Lisp_Hash_Table *ht = XHASH_TABLE (obj); | |
| 332 | |
| 333 /* If the hash table is weak, we don't want to mark the keys and | |
| 334 values (we scan over them after everything else has been marked, | |
| 335 and mark or remove them as necessary). */ | |
| 336 if (ht->weakness == HASH_TABLE_NON_WEAK) | |
| 337 { | |
| 1204 | 338 htentry *e, *sentinel; |
| 428 | 339 |
| 340 for (e = ht->hentries, sentinel = e + ht->size; e < sentinel; e++) | |
| 1204 | 341 if (!HTENTRY_CLEAR_P (e)) |
| 428 | 342 { |
| 343 mark_object (e->key); | |
| 344 mark_object (e->value); | |
| 345 } | |
| 346 } | |
|
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
347 |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
348 mark_object (ht->test); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
349 |
| 428 | 350 return Qnil; |
| 351 } | |
| 352 | |
| 353 /* Equality of hash tables. Two hash tables are equal when they are of | |
| 354 the same weakness and test function, they have the same number of | |
| 355 elements, and for each key in the hash table, the values are `equal'. | |
| 356 | |
| 357 This is similar to Common Lisp `equalp' of hash tables, with the | |
| 358 difference that CL requires the keys to be compared with the test | |
| 359 function, which we don't do. Doing that would require consing, and | |
| 360 consing is a bad idea in `equal'. Anyway, our method should provide | |
| 361 the same result -- if the keys are not equal according to the test | |
| 362 function, then Fgethash() in hash_table_equal_mapper() will fail. */ | |
| 363 static int | |
|
4906
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
364 hash_table_equal (Lisp_Object hash_table1, Lisp_Object hash_table2, int depth, |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
365 int foldcase) |
| 428 | 366 { |
| 367 Lisp_Hash_Table *ht1 = XHASH_TABLE (hash_table1); | |
| 368 Lisp_Hash_Table *ht2 = XHASH_TABLE (hash_table2); | |
| 1204 | 369 htentry *e, *sentinel; |
| 428 | 370 |
|
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
371 if (!(EQ (ht1->test, ht2->test)) || |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
372 (ht1->weakness != ht2->weakness) || |
| 428 | 373 (ht1->count != ht2->count)) |
| 374 return 0; | |
| 375 | |
| 376 depth++; | |
| 377 | |
| 378 for (e = ht1->hentries, sentinel = e + ht1->size; e < sentinel; e++) | |
| 1204 | 379 if (!HTENTRY_CLEAR_P (e)) |
| 428 | 380 /* Look up the key in the other hash table, and compare the values. */ |
| 381 { | |
| 382 Lisp_Object value_in_other = Fgethash (e->key, hash_table2, Qunbound); | |
| 383 if (UNBOUNDP (value_in_other) || | |
|
4906
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
384 !internal_equal_0 (e->value, value_in_other, depth, foldcase)) |
| 428 | 385 return 0; /* Give up */ |
| 386 } | |
| 387 | |
| 388 return 1; | |
| 389 } | |
| 442 | 390 |
| 391 /* This is not a great hash function, but it _is_ correct and fast. | |
| 392 Examining all entries is too expensive, and examining a random | |
| 393 subset does not yield a correct hash function. */ | |
| 665 | 394 static Hashcode |
|
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
395 hash_table_hash (Lisp_Object hash_table, int UNUSED (depth), |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
396 int UNUSED (equalp)) |
| 442 | 397 { |
| 398 return XHASH_TABLE (hash_table)->count; | |
| 399 } | |
| 400 | |
|
5158
9e0b43d3095c
more cleanups to object-memory-usage stuff
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
401 #ifdef MEMORY_USAGE_STATS |
|
9e0b43d3095c
more cleanups to object-memory-usage stuff
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
402 |
|
9e0b43d3095c
more cleanups to object-memory-usage stuff
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
403 struct hash_table_stats |
|
9e0b43d3095c
more cleanups to object-memory-usage stuff
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
404 { |
|
9e0b43d3095c
more cleanups to object-memory-usage stuff
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
405 struct usage_stats u; |
|
9e0b43d3095c
more cleanups to object-memory-usage stuff
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
406 Bytecount hentries; |
|
9e0b43d3095c
more cleanups to object-memory-usage stuff
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
407 }; |
|
9e0b43d3095c
more cleanups to object-memory-usage stuff
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
408 |
|
9e0b43d3095c
more cleanups to object-memory-usage stuff
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
409 static void |
|
9e0b43d3095c
more cleanups to object-memory-usage stuff
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
410 hash_table_memory_usage (Lisp_Object hashtab, |
|
9e0b43d3095c
more cleanups to object-memory-usage stuff
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
411 struct generic_usage_stats *gustats) |
|
9e0b43d3095c
more cleanups to object-memory-usage stuff
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
412 { |
|
9e0b43d3095c
more cleanups to object-memory-usage stuff
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
413 Lisp_Hash_Table *ht = XHASH_TABLE (hashtab); |
|
9e0b43d3095c
more cleanups to object-memory-usage stuff
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
414 struct hash_table_stats *stats = (struct hash_table_stats *) gustats; |
|
9e0b43d3095c
more cleanups to object-memory-usage stuff
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
415 stats->hentries += |
|
9e0b43d3095c
more cleanups to object-memory-usage stuff
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
416 malloced_storage_size (ht->hentries, |
|
9e0b43d3095c
more cleanups to object-memory-usage stuff
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
417 sizeof (htentry) * (ht->size + 1), |
|
9e0b43d3095c
more cleanups to object-memory-usage stuff
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
418 &stats->u); |
|
9e0b43d3095c
more cleanups to object-memory-usage stuff
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
419 } |
|
9e0b43d3095c
more cleanups to object-memory-usage stuff
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
420 |
|
9e0b43d3095c
more cleanups to object-memory-usage stuff
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
421 #endif /* MEMORY_USAGE_STATS */ |
|
9e0b43d3095c
more cleanups to object-memory-usage stuff
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
422 |
| 428 | 423 |
| 424 /* Printing hash tables. | |
| 425 | |
| 426 This is non-trivial, because we use a readable structure-style | |
| 427 syntax for hash tables. This means that a typical hash table will be | |
| 428 readably printed in the form of: | |
| 429 | |
|
4820
e6dec75ded0e
Use keywords, not ordinary symbols, in the structure syntax for hash tables.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4779
diff
changeset
|
430 #s(hash-table :size 2 :data (key1 value1 key2 value2)) |
| 428 | 431 |
| 432 The supported hash table structure keywords and their values are: | |
|
4820
e6dec75ded0e
Use keywords, not ordinary symbols, in the structure syntax for hash tables.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4779
diff
changeset
|
433 `:test' (eql (or nil), eq or equal) |
|
e6dec75ded0e
Use keywords, not ordinary symbols, in the structure syntax for hash tables.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4779
diff
changeset
|
434 `:size' (a natnum or nil) |
|
e6dec75ded0e
Use keywords, not ordinary symbols, in the structure syntax for hash tables.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4779
diff
changeset
|
435 `:rehash-size' (a float) |
|
e6dec75ded0e
Use keywords, not ordinary symbols, in the structure syntax for hash tables.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4779
diff
changeset
|
436 `:rehash-threshold' (a float) |
|
e6dec75ded0e
Use keywords, not ordinary symbols, in the structure syntax for hash tables.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4779
diff
changeset
|
437 `:weakness' (nil, key, value, key-and-value, or key-or-value) |
|
e6dec75ded0e
Use keywords, not ordinary symbols, in the structure syntax for hash tables.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4779
diff
changeset
|
438 `:data' (a list) |
| 428 | 439 |
| 430 | 440 If `print-readably' is nil, then a simpler syntax is used, for example |
| 428 | 441 |
| 442 #<hash-table size 2/13 data (key1 value1 key2 value2) 0x874d> | |
| 443 | |
| 444 The data is truncated to four pairs, and the rest is shown with | |
| 445 `...'. This printer does not cons. */ | |
| 446 | |
| 447 | |
| 448 /* Print the data of the hash table. This maps through a Lisp | |
| 449 hash table and prints key/value pairs using PRINTCHARFUN. */ | |
| 450 static void | |
| 451 print_hash_table_data (Lisp_Hash_Table *ht, Lisp_Object printcharfun) | |
| 452 { | |
| 453 int count = 0; | |
| 1204 | 454 htentry *e, *sentinel; |
| 428 | 455 |
|
4952
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4820
diff
changeset
|
456 write_ascstring (printcharfun, " :data ("); |
| 428 | 457 |
| 458 for (e = ht->hentries, sentinel = e + ht->size; e < sentinel; e++) | |
| 1204 | 459 if (!HTENTRY_CLEAR_P (e)) |
| 428 | 460 { |
| 461 if (count > 0) | |
|
4952
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4820
diff
changeset
|
462 write_ascstring (printcharfun, " "); |
| 428 | 463 if (!print_readably && count > 3) |
| 464 { | |
|
4952
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4820
diff
changeset
|
465 write_ascstring (printcharfun, "..."); |
| 428 | 466 break; |
| 467 } | |
| 468 print_internal (e->key, printcharfun, 1); | |
| 800 | 469 write_fmt_string_lisp (printcharfun, " %S", 1, e->value); |
| 428 | 470 count++; |
| 471 } | |
| 472 | |
|
4952
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4820
diff
changeset
|
473 write_ascstring (printcharfun, ")"); |
| 428 | 474 } |
| 475 | |
| 476 static void | |
| 2286 | 477 print_hash_table (Lisp_Object obj, Lisp_Object printcharfun, |
| 478 int UNUSED (escapeflag)) | |
| 428 | 479 { |
| 480 Lisp_Hash_Table *ht = XHASH_TABLE (obj); | |
|
4777
c69aeb86b2a3
Serialise non-default hash table rehash thresholds correctly; use this.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4693
diff
changeset
|
481 Ascbyte pigbuf[350]; |
| 428 | 482 |
|
4952
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4820
diff
changeset
|
483 write_ascstring (printcharfun, |
| 826 | 484 print_readably ? "#s(hash-table" : "#<hash-table"); |
| 428 | 485 |
|
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
486 if (!(EQ (ht->test, Vhash_table_test_eql))) |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
487 { |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
488 write_fmt_string_lisp (printcharfun, " :test %S", |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
489 1, XHASH_TABLE_TEST (ht->test)->name); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
490 } |
| 428 | 491 |
| 492 if (ht->count || !print_readably) | |
| 493 { | |
| 494 if (print_readably) | |
|
4820
e6dec75ded0e
Use keywords, not ordinary symbols, in the structure syntax for hash tables.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4779
diff
changeset
|
495 write_fmt_string (printcharfun, " :size %ld", (long) ht->count); |
| 428 | 496 else |
|
4820
e6dec75ded0e
Use keywords, not ordinary symbols, in the structure syntax for hash tables.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4779
diff
changeset
|
497 write_fmt_string (printcharfun, " :size %ld/%ld", (long) ht->count, |
| 800 | 498 (long) ht->size); |
| 428 | 499 } |
| 500 | |
| 501 if (ht->weakness != HASH_TABLE_NON_WEAK) | |
| 502 { | |
| 800 | 503 write_fmt_string |
|
4820
e6dec75ded0e
Use keywords, not ordinary symbols, in the structure syntax for hash tables.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4779
diff
changeset
|
504 (printcharfun, " :weakness %s", |
| 800 | 505 (ht->weakness == HASH_TABLE_WEAK ? "key-and-value" : |
| 506 ht->weakness == HASH_TABLE_KEY_WEAK ? "key" : | |
| 507 ht->weakness == HASH_TABLE_VALUE_WEAK ? "value" : | |
| 508 ht->weakness == HASH_TABLE_KEY_VALUE_WEAK ? "key-or-value" : | |
| 509 "you-d-better-not-see-this")); | |
| 428 | 510 } |
| 511 | |
|
4777
c69aeb86b2a3
Serialise non-default hash table rehash thresholds correctly; use this.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4693
diff
changeset
|
512 if (ht->rehash_size != HASH_TABLE_DEFAULT_REHASH_SIZE) |
|
c69aeb86b2a3
Serialise non-default hash table rehash thresholds correctly; use this.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4693
diff
changeset
|
513 { |
|
c69aeb86b2a3
Serialise non-default hash table rehash thresholds correctly; use this.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4693
diff
changeset
|
514 float_to_string (pigbuf, ht->rehash_size); |
|
4820
e6dec75ded0e
Use keywords, not ordinary symbols, in the structure syntax for hash tables.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4779
diff
changeset
|
515 write_fmt_string (printcharfun, " :rehash-size %s", pigbuf); |
|
4777
c69aeb86b2a3
Serialise non-default hash table rehash thresholds correctly; use this.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4693
diff
changeset
|
516 } |
|
c69aeb86b2a3
Serialise non-default hash table rehash thresholds correctly; use this.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4693
diff
changeset
|
517 |
|
c69aeb86b2a3
Serialise non-default hash table rehash thresholds correctly; use this.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4693
diff
changeset
|
518 if (ht->rehash_threshold |
|
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
519 != HASH_TABLE_DEFAULT_REHASH_THRESHOLD (ht->size, ht->test)) |
|
4777
c69aeb86b2a3
Serialise non-default hash table rehash thresholds correctly; use this.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4693
diff
changeset
|
520 { |
|
c69aeb86b2a3
Serialise non-default hash table rehash thresholds correctly; use this.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4693
diff
changeset
|
521 float_to_string (pigbuf, ht->rehash_threshold); |
|
4820
e6dec75ded0e
Use keywords, not ordinary symbols, in the structure syntax for hash tables.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4779
diff
changeset
|
522 write_fmt_string (printcharfun, " :rehash-threshold %s", pigbuf); |
|
4777
c69aeb86b2a3
Serialise non-default hash table rehash thresholds correctly; use this.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4693
diff
changeset
|
523 } |
|
c69aeb86b2a3
Serialise non-default hash table rehash thresholds correctly; use this.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4693
diff
changeset
|
524 |
| 428 | 525 if (ht->count) |
| 526 print_hash_table_data (ht, printcharfun); | |
| 527 | |
| 528 if (print_readably) | |
|
4952
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4820
diff
changeset
|
529 write_ascstring (printcharfun, ")"); |
| 428 | 530 else |
|
5146
88bd4f3ef8e4
make lrecord UID's have a separate UID space for each object, resurrect debug SOE code in extents.c
Ben Wing <ben@xemacs.org>
parents:
5142
diff
changeset
|
531 write_fmt_string (printcharfun, " 0x%x>", LISP_OBJECT_UID (obj)); |
| 428 | 532 } |
| 533 | |
|
5169
6c6d78781d59
cleanup of code related to xfree(), better KKCC backtrace capabilities, document XD_INLINE_LISP_OBJECT_BLOCK_PTR, fix some memory leaks, other code cleanup
Ben Wing <ben@xemacs.org>
parents:
5158
diff
changeset
|
534 #ifdef ERROR_CHECK_STRUCTURES |
|
6c6d78781d59
cleanup of code related to xfree(), better KKCC backtrace capabilities, document XD_INLINE_LISP_OBJECT_BLOCK_PTR, fix some memory leaks, other code cleanup
Ben Wing <ben@xemacs.org>
parents:
5158
diff
changeset
|
535 #define USED_IF_ERROR_CHECK_STRUCTURES(x) x |
|
6c6d78781d59
cleanup of code related to xfree(), better KKCC backtrace capabilities, document XD_INLINE_LISP_OBJECT_BLOCK_PTR, fix some memory leaks, other code cleanup
Ben Wing <ben@xemacs.org>
parents:
5158
diff
changeset
|
536 #else |
|
6c6d78781d59
cleanup of code related to xfree(), better KKCC backtrace capabilities, document XD_INLINE_LISP_OBJECT_BLOCK_PTR, fix some memory leaks, other code cleanup
Ben Wing <ben@xemacs.org>
parents:
5158
diff
changeset
|
537 #define USED_IF_ERROR_CHECK_STRUCTURES(x) UNUSED (x) |
|
6c6d78781d59
cleanup of code related to xfree(), better KKCC backtrace capabilities, document XD_INLINE_LISP_OBJECT_BLOCK_PTR, fix some memory leaks, other code cleanup
Ben Wing <ben@xemacs.org>
parents:
5158
diff
changeset
|
538 #endif |
|
6c6d78781d59
cleanup of code related to xfree(), better KKCC backtrace capabilities, document XD_INLINE_LISP_OBJECT_BLOCK_PTR, fix some memory leaks, other code cleanup
Ben Wing <ben@xemacs.org>
parents:
5158
diff
changeset
|
539 |
| 4117 | 540 #ifndef NEW_GC |
| 428 | 541 static void |
| 4117 | 542 free_hentries (htentry *hentries, |
|
5169
6c6d78781d59
cleanup of code related to xfree(), better KKCC backtrace capabilities, document XD_INLINE_LISP_OBJECT_BLOCK_PTR, fix some memory leaks, other code cleanup
Ben Wing <ben@xemacs.org>
parents:
5158
diff
changeset
|
543 Elemcount USED_IF_ERROR_CHECK_STRUCTURES (size)) |
| 489 | 544 { |
| 800 | 545 #ifdef ERROR_CHECK_STRUCTURES |
| 489 | 546 /* Ensure a crash if other code uses the discarded entries afterwards. */ |
|
5146
88bd4f3ef8e4
make lrecord UID's have a separate UID space for each object, resurrect debug SOE code in extents.c
Ben Wing <ben@xemacs.org>
parents:
5142
diff
changeset
|
547 deadbeef_memory (hentries, |
|
88bd4f3ef8e4
make lrecord UID's have a separate UID space for each object, resurrect debug SOE code in extents.c
Ben Wing <ben@xemacs.org>
parents:
5142
diff
changeset
|
548 (Rawbyte *) (hentries + size) - (Rawbyte *) hentries); |
| 489 | 549 #endif |
| 550 | |
| 551 if (!DUMPEDP (hentries)) | |
|
4976
16112448d484
Rename xfree(FOO, TYPE) -> xfree(FOO)
Ben Wing <ben@xemacs.org>
parents:
4962
diff
changeset
|
552 xfree (hentries); |
| 489 | 553 } |
| 554 | |
| 555 static void | |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5125
diff
changeset
|
556 finalize_hash_table (Lisp_Object obj) |
| 428 | 557 { |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5125
diff
changeset
|
558 Lisp_Hash_Table *ht = XHASH_TABLE (obj); |
|
5124
623d57b7fbe8
separate regular and disksave finalization, print method fixes.
Ben Wing <ben@xemacs.org>
parents:
5120
diff
changeset
|
559 free_hentries (ht->hentries, ht->size); |
|
623d57b7fbe8
separate regular and disksave finalization, print method fixes.
Ben Wing <ben@xemacs.org>
parents:
5120
diff
changeset
|
560 ht->hentries = 0; |
| 428 | 561 } |
| 3263 | 562 #endif /* not NEW_GC */ |
| 428 | 563 |
| 1204 | 564 static const struct memory_description htentry_description_1[] = { |
| 565 { XD_LISP_OBJECT, offsetof (htentry, key) }, | |
| 566 { XD_LISP_OBJECT, offsetof (htentry, value) }, | |
| 428 | 567 { XD_END } |
| 568 }; | |
| 569 | |
| 1204 | 570 static const struct sized_memory_description htentry_description = { |
| 571 sizeof (htentry), | |
| 572 htentry_description_1 | |
| 428 | 573 }; |
| 574 | |
| 3092 | 575 #ifdef NEW_GC |
| 576 static const struct memory_description htentry_weak_description_1[] = { | |
| 577 { XD_LISP_OBJECT, offsetof (htentry, key), 0, { 0 }, XD_FLAG_NO_KKCC}, | |
| 578 { XD_LISP_OBJECT, offsetof (htentry, value), 0, { 0 }, XD_FLAG_NO_KKCC}, | |
| 579 { XD_END } | |
| 580 }; | |
| 581 | |
| 582 static const struct sized_memory_description htentry_weak_description = { | |
| 583 sizeof (htentry), | |
| 584 htentry_weak_description_1 | |
| 585 }; | |
| 586 | |
|
5118
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
587 DEFINE_DUMPABLE_INTERNAL_LISP_OBJECT ("hash-table-entry", hash_table_entry, |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
588 0, htentry_description_1, |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
589 Lisp_Hash_Table_Entry); |
| 3092 | 590 #endif /* NEW_GC */ |
| 591 | |
| 1204 | 592 static const struct memory_description htentry_union_description_1[] = { |
| 593 /* Note: XD_INDIRECT in this table refers to the surrounding table, | |
| 594 and so this will work. */ | |
| 3092 | 595 #ifdef NEW_GC |
|
5169
6c6d78781d59
cleanup of code related to xfree(), better KKCC backtrace capabilities, document XD_INLINE_LISP_OBJECT_BLOCK_PTR, fix some memory leaks, other code cleanup
Ben Wing <ben@xemacs.org>
parents:
5158
diff
changeset
|
596 { XD_INLINE_LISP_OBJECT_BLOCK_PTR, HASH_TABLE_NON_WEAK, |
| 3092 | 597 XD_INDIRECT (0, 1), { &htentry_description } }, |
|
5169
6c6d78781d59
cleanup of code related to xfree(), better KKCC backtrace capabilities, document XD_INLINE_LISP_OBJECT_BLOCK_PTR, fix some memory leaks, other code cleanup
Ben Wing <ben@xemacs.org>
parents:
5158
diff
changeset
|
598 { XD_INLINE_LISP_OBJECT_BLOCK_PTR, 0, XD_INDIRECT (0, 1), |
| 3092 | 599 { &htentry_weak_description }, XD_FLAG_UNION_DEFAULT_ENTRY }, |
| 600 #else /* not NEW_GC */ | |
| 2367 | 601 { XD_BLOCK_PTR, HASH_TABLE_NON_WEAK, XD_INDIRECT (0, 1), |
| 2551 | 602 { &htentry_description } }, |
| 603 { XD_BLOCK_PTR, 0, XD_INDIRECT (0, 1), { &htentry_description }, | |
| 1204 | 604 XD_FLAG_UNION_DEFAULT_ENTRY | XD_FLAG_NO_KKCC }, |
| 3092 | 605 #endif /* not NEW_GC */ |
| 1204 | 606 { XD_END } |
| 607 }; | |
| 608 | |
| 609 static const struct sized_memory_description htentry_union_description = { | |
| 610 sizeof (htentry *), | |
| 611 htentry_union_description_1 | |
| 612 }; | |
| 613 | |
| 614 const struct memory_description hash_table_description[] = { | |
| 615 { XD_ELEMCOUNT, offsetof (Lisp_Hash_Table, size) }, | |
| 616 { XD_INT, offsetof (Lisp_Hash_Table, weakness) }, | |
| 617 { XD_UNION, offsetof (Lisp_Hash_Table, hentries), XD_INDIRECT (1, 0), | |
| 2551 | 618 { &htentry_union_description } }, |
| 440 | 619 { XD_LO_LINK, offsetof (Lisp_Hash_Table, next_weak) }, |
|
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
620 { XD_LISP_OBJECT,offsetof (Lisp_Hash_Table, test) }, |
| 428 | 621 { XD_END } |
| 622 }; | |
| 623 | |
|
5118
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
624 DEFINE_DUMPABLE_LISP_OBJECT ("hash-table", hash_table, |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
625 mark_hash_table, print_hash_table, |
|
5169
6c6d78781d59
cleanup of code related to xfree(), better KKCC backtrace capabilities, document XD_INLINE_LISP_OBJECT_BLOCK_PTR, fix some memory leaks, other code cleanup
Ben Wing <ben@xemacs.org>
parents:
5158
diff
changeset
|
626 IF_OLD_GC (finalize_hash_table), |
|
5118
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
627 hash_table_equal, hash_table_hash, |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
628 hash_table_description, |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
629 Lisp_Hash_Table); |
| 428 | 630 |
| 631 static Lisp_Hash_Table * | |
| 632 xhash_table (Lisp_Object hash_table) | |
| 633 { | |
| 1123 | 634 /* #### What's going on here? Why the gc_in_progress check? */ |
| 428 | 635 if (!gc_in_progress) |
| 636 CHECK_HASH_TABLE (hash_table); | |
| 637 check_hash_table_invariants (XHASH_TABLE (hash_table)); | |
| 638 return XHASH_TABLE (hash_table); | |
| 639 } | |
| 640 | |
| 641 | |
| 642 /************************************************************************/ | |
| 643 /* Creation of Hash Tables */ | |
| 644 /************************************************************************/ | |
| 645 | |
| 646 /* Creation of hash tables, without error-checking. */ | |
| 647 static void | |
| 648 compute_hash_table_derived_values (Lisp_Hash_Table *ht) | |
| 649 { | |
| 665 | 650 ht->rehash_count = (Elemcount) |
| 438 | 651 ((double) ht->size * ht->rehash_threshold); |
| 665 | 652 ht->golden_ratio = (Elemcount) |
| 428 | 653 ((double) ht->size * (.6180339887 / (double) sizeof (Lisp_Object))); |
| 654 } | |
| 655 | |
|
5118
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
656 static htentry * |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
657 allocate_hash_table_entries (Elemcount size) |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
658 { |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
659 #ifdef NEW_GC |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
660 return XHASH_TABLE_ENTRY (alloc_lrecord_array |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
661 (size, &lrecord_hash_table_entry)); |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
662 #else /* not NEW_GC */ |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
663 return xnew_array_and_zero (htentry, size); |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
664 #endif /* not NEW_GC */ |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
665 } |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
666 |
|
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
667 static Lisp_Object decode_hash_table_test (Lisp_Object obj); |
| 450 | 668 |
| 669 Lisp_Object | |
|
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
670 make_general_lisp_hash_table (Lisp_Object test, |
| 665 | 671 Elemcount size, |
| 428 | 672 double rehash_size, |
| 673 double rehash_threshold, | |
| 674 enum hash_table_weakness weakness) | |
| 675 { | |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5125
diff
changeset
|
676 Lisp_Object hash_table = ALLOC_NORMAL_LISP_OBJECT (hash_table); |
|
5117
3742ea8250b5
Checking in final CVS version of workspace 'ben-lisp-object'
Ben Wing <ben@xemacs.org>
parents:
3017
diff
changeset
|
677 Lisp_Hash_Table *ht = XHASH_TABLE (hash_table); |
| 428 | 678 |
|
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
679 assert (HASH_TABLE_TESTP (test)); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
680 |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
681 ht->test = test; |
| 438 | 682 ht->weakness = weakness; |
| 683 | |
| 684 ht->rehash_size = | |
| 685 rehash_size > 1.0 ? rehash_size : HASH_TABLE_DEFAULT_REHASH_SIZE; | |
| 686 | |
| 687 ht->rehash_threshold = | |
| 688 rehash_threshold > 0.0 ? rehash_threshold : | |
|
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
689 HASH_TABLE_DEFAULT_REHASH_THRESHOLD (size, ht->test); |
| 438 | 690 |
| 428 | 691 if (size < HASH_TABLE_MIN_SIZE) |
| 692 size = HASH_TABLE_MIN_SIZE; | |
| 665 | 693 ht->size = hash_table_size ((Elemcount) (((double) size / ht->rehash_threshold) |
| 438 | 694 + 1.0)); |
| 428 | 695 ht->count = 0; |
| 438 | 696 |
| 428 | 697 compute_hash_table_derived_values (ht); |
| 698 | |
| 1204 | 699 /* We leave room for one never-occupied sentinel htentry at the end. */ |
|
5118
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
700 ht->hentries = allocate_hash_table_entries (ht->size + 1); |
| 428 | 701 |
| 702 if (weakness == HASH_TABLE_NON_WEAK) | |
| 703 ht->next_weak = Qunbound; | |
| 704 else | |
| 705 ht->next_weak = Vall_weak_hash_tables, Vall_weak_hash_tables = hash_table; | |
| 706 | |
| 707 return hash_table; | |
| 708 } | |
| 709 | |
| 710 Lisp_Object | |
|
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
711 make_lisp_hash_table (Elemcount size, enum hash_table_weakness weakness, |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
712 Lisp_Object test) |
| 428 | 713 { |
|
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
714 test = decode_hash_table_test (test); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
715 return make_general_lisp_hash_table (test, size, -1.0, -1.0, weakness); |
| 428 | 716 } |
| 717 | |
| 718 /* Pretty reading of hash tables. | |
| 719 | |
| 720 Here we use the existing structures mechanism (which is, | |
| 721 unfortunately, pretty cumbersome) for validating and instantiating | |
| 722 the hash tables. The idea is that the side-effect of reading a | |
| 723 #s(hash-table PLIST) object is creation of a hash table with desired | |
| 724 properties, and that the hash table is returned. */ | |
| 725 | |
| 726 /* Validation functions: each keyword provides its own validation | |
| 727 function. The errors should maybe be continuable, but it is | |
| 728 unclear how this would cope with ERRB. */ | |
| 729 static int | |
| 2286 | 730 hash_table_size_validate (Lisp_Object UNUSED (keyword), Lisp_Object value, |
| 731 Error_Behavior errb) | |
| 428 | 732 { |
| 733 if (NATNUMP (value)) | |
|
5307
c096d8051f89
Have NATNUMP give t for positive bignums; check limits appropriately.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5277
diff
changeset
|
734 { |
|
c096d8051f89
Have NATNUMP give t for positive bignums; check limits appropriately.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5277
diff
changeset
|
735 if (BIGNUMP (value)) |
|
c096d8051f89
Have NATNUMP give t for positive bignums; check limits appropriately.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5277
diff
changeset
|
736 { |
|
c096d8051f89
Have NATNUMP give t for positive bignums; check limits appropriately.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5277
diff
changeset
|
737 /* hash_table_size() can't handle excessively large sizes. */ |
|
c096d8051f89
Have NATNUMP give t for positive bignums; check limits appropriately.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5277
diff
changeset
|
738 maybe_signal_error_1 (Qargs_out_of_range, |
|
c096d8051f89
Have NATNUMP give t for positive bignums; check limits appropriately.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5277
diff
changeset
|
739 list3 (value, Qzero, |
|
c096d8051f89
Have NATNUMP give t for positive bignums; check limits appropriately.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5277
diff
changeset
|
740 make_integer (EMACS_INT_MAX)), |
|
c096d8051f89
Have NATNUMP give t for positive bignums; check limits appropriately.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5277
diff
changeset
|
741 Qhash_table, errb); |
|
c096d8051f89
Have NATNUMP give t for positive bignums; check limits appropriately.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5277
diff
changeset
|
742 return 0; |
|
c096d8051f89
Have NATNUMP give t for positive bignums; check limits appropriately.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5277
diff
changeset
|
743 } |
|
c096d8051f89
Have NATNUMP give t for positive bignums; check limits appropriately.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5277
diff
changeset
|
744 else |
|
c096d8051f89
Have NATNUMP give t for positive bignums; check limits appropriately.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5277
diff
changeset
|
745 { |
|
c096d8051f89
Have NATNUMP give t for positive bignums; check limits appropriately.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5277
diff
changeset
|
746 return 1; |
|
c096d8051f89
Have NATNUMP give t for positive bignums; check limits appropriately.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5277
diff
changeset
|
747 } |
|
c096d8051f89
Have NATNUMP give t for positive bignums; check limits appropriately.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5277
diff
changeset
|
748 } |
|
c096d8051f89
Have NATNUMP give t for positive bignums; check limits appropriately.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5277
diff
changeset
|
749 else |
|
c096d8051f89
Have NATNUMP give t for positive bignums; check limits appropriately.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5277
diff
changeset
|
750 { |
|
c096d8051f89
Have NATNUMP give t for positive bignums; check limits appropriately.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5277
diff
changeset
|
751 maybe_signal_error_1 (Qwrong_type_argument, list2 (Qnatnump, value), |
|
c096d8051f89
Have NATNUMP give t for positive bignums; check limits appropriately.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5277
diff
changeset
|
752 Qhash_table, errb); |
|
c096d8051f89
Have NATNUMP give t for positive bignums; check limits appropriately.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5277
diff
changeset
|
753 } |
| 428 | 754 |
| 755 return 0; | |
| 756 } | |
| 757 | |
| 665 | 758 static Elemcount |
| 428 | 759 decode_hash_table_size (Lisp_Object obj) |
| 760 { | |
| 761 return NILP (obj) ? HASH_TABLE_DEFAULT_SIZE : XINT (obj); | |
| 762 } | |
| 763 | |
| 764 static int | |
| 2286 | 765 hash_table_weakness_validate (Lisp_Object UNUSED (keyword), Lisp_Object value, |
| 578 | 766 Error_Behavior errb) |
| 428 | 767 { |
| 442 | 768 if (EQ (value, Qnil)) return 1; |
| 769 if (EQ (value, Qt)) return 1; | |
| 770 if (EQ (value, Qkey)) return 1; | |
| 771 if (EQ (value, Qkey_and_value)) return 1; | |
| 772 if (EQ (value, Qkey_or_value)) return 1; | |
| 773 if (EQ (value, Qvalue)) return 1; | |
| 428 | 774 |
|
5222
18c0b5909d16
Use keywords in structure syntax; new #define, NEED_TO_HANDLE_21_4_CODE 1
Aidan Kehoe <kehoea@parhasard.net>
parents:
5193
diff
changeset
|
775 #ifdef NEED_TO_HANDLE_21_4_CODE |
| 428 | 776 /* Following values are obsolete as of 19990901 in xemacs-21.2 */ |
| 442 | 777 if (EQ (value, Qnon_weak)) return 1; |
| 778 if (EQ (value, Qweak)) return 1; | |
| 779 if (EQ (value, Qkey_weak)) return 1; | |
| 780 if (EQ (value, Qkey_or_value_weak)) return 1; | |
| 781 if (EQ (value, Qvalue_weak)) return 1; | |
|
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
782 #endif |
| 428 | 783 |
| 563 | 784 maybe_invalid_constant ("Invalid hash table weakness", |
| 428 | 785 value, Qhash_table, errb); |
| 786 return 0; | |
| 787 } | |
| 788 | |
| 789 static enum hash_table_weakness | |
| 790 decode_hash_table_weakness (Lisp_Object obj) | |
| 791 { | |
| 442 | 792 if (EQ (obj, Qnil)) return HASH_TABLE_NON_WEAK; |
| 793 if (EQ (obj, Qt)) return HASH_TABLE_WEAK; | |
| 794 if (EQ (obj, Qkey_and_value)) return HASH_TABLE_WEAK; | |
| 795 if (EQ (obj, Qkey)) return HASH_TABLE_KEY_WEAK; | |
| 796 if (EQ (obj, Qkey_or_value)) return HASH_TABLE_KEY_VALUE_WEAK; | |
| 797 if (EQ (obj, Qvalue)) return HASH_TABLE_VALUE_WEAK; | |
| 428 | 798 |
|
5222
18c0b5909d16
Use keywords in structure syntax; new #define, NEED_TO_HANDLE_21_4_CODE 1
Aidan Kehoe <kehoea@parhasard.net>
parents:
5193
diff
changeset
|
799 #ifdef NEED_TO_HANDLE_21_4_CODE |
| 428 | 800 /* Following values are obsolete as of 19990901 in xemacs-21.2 */ |
| 442 | 801 if (EQ (obj, Qnon_weak)) return HASH_TABLE_NON_WEAK; |
| 802 if (EQ (obj, Qweak)) return HASH_TABLE_WEAK; | |
| 803 if (EQ (obj, Qkey_weak)) return HASH_TABLE_KEY_WEAK; | |
| 804 if (EQ (obj, Qkey_or_value_weak)) return HASH_TABLE_KEY_VALUE_WEAK; | |
| 805 if (EQ (obj, Qvalue_weak)) return HASH_TABLE_VALUE_WEAK; | |
|
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
806 #endif |
| 428 | 807 |
| 563 | 808 invalid_constant ("Invalid hash table weakness", obj); |
| 1204 | 809 RETURN_NOT_REACHED (HASH_TABLE_NON_WEAK); |
| 428 | 810 } |
| 811 | |
| 812 static int | |
| 2286 | 813 hash_table_test_validate (Lisp_Object UNUSED (keyword), Lisp_Object value, |
| 814 Error_Behavior errb) | |
| 428 | 815 { |
|
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
816 Lisp_Object lookup; |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
817 |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
818 if (NILP (value)) |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
819 { |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
820 return 1; |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
821 } |
| 428 | 822 |
|
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
823 lookup = Fassq (value, XWEAK_LIST_LIST (Vhash_table_test_weak_list)); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
824 if (NILP (lookup)) |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
825 { |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
826 maybe_invalid_constant ("Invalid hash table test", |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
827 value, Qhash_table, errb); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
828 } |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
829 |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
830 return 1; |
| 428 | 831 } |
| 832 | |
|
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
833 static Lisp_Object |
| 428 | 834 decode_hash_table_test (Lisp_Object obj) |
| 835 { | |
|
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
836 Lisp_Object result; |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
837 |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
838 if (NILP (obj)) |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
839 { |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
840 obj = Qeql; |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
841 } |
| 428 | 842 |
|
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
843 result = Fassq (obj, XWEAK_LIST_LIST (Vhash_table_test_weak_list)); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
844 if (NILP (result)) |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
845 { |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
846 invalid_constant ("Invalid hash table test", obj); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
847 } |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
848 |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
849 return XCDR (result); |
| 428 | 850 } |
| 851 | |
| 852 static int | |
| 2286 | 853 hash_table_rehash_size_validate (Lisp_Object UNUSED (keyword), |
| 854 Lisp_Object value, Error_Behavior errb) | |
| 428 | 855 { |
| 856 if (!FLOATP (value)) | |
| 857 { | |
| 563 | 858 maybe_signal_error_1 (Qwrong_type_argument, list2 (Qfloatp, value), |
| 428 | 859 Qhash_table, errb); |
| 860 return 0; | |
| 861 } | |
| 862 | |
| 863 { | |
| 864 double rehash_size = XFLOAT_DATA (value); | |
| 865 if (rehash_size <= 1.0) | |
| 866 { | |
| 563 | 867 maybe_invalid_argument |
| 428 | 868 ("Hash table rehash size must be greater than 1.0", |
| 869 value, Qhash_table, errb); | |
| 870 return 0; | |
| 871 } | |
| 872 } | |
| 873 | |
| 874 return 1; | |
| 875 } | |
| 876 | |
| 877 static double | |
| 878 decode_hash_table_rehash_size (Lisp_Object rehash_size) | |
| 879 { | |
|
4585
871eb054b34a
Document non-obvious usages.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4410
diff
changeset
|
880 /* -1.0 signals make_general_lisp_hash_table to use the default. */ |
| 428 | 881 return NILP (rehash_size) ? -1.0 : XFLOAT_DATA (rehash_size); |
| 882 } | |
| 883 | |
| 884 static int | |
| 2286 | 885 hash_table_rehash_threshold_validate (Lisp_Object UNUSED (keyword), |
| 886 Lisp_Object value, Error_Behavior errb) | |
| 428 | 887 { |
| 888 if (!FLOATP (value)) | |
| 889 { | |
| 563 | 890 maybe_signal_error_1 (Qwrong_type_argument, list2 (Qfloatp, value), |
| 428 | 891 Qhash_table, errb); |
| 892 return 0; | |
| 893 } | |
| 894 | |
| 895 { | |
| 896 double rehash_threshold = XFLOAT_DATA (value); | |
| 897 if (rehash_threshold <= 0.0 || rehash_threshold >= 1.0) | |
| 898 { | |
| 563 | 899 maybe_invalid_argument |
| 428 | 900 ("Hash table rehash threshold must be between 0.0 and 1.0", |
| 901 value, Qhash_table, errb); | |
| 902 return 0; | |
| 903 } | |
| 904 } | |
| 905 | |
| 906 return 1; | |
| 907 } | |
| 908 | |
| 909 static double | |
| 910 decode_hash_table_rehash_threshold (Lisp_Object rehash_threshold) | |
| 911 { | |
|
4585
871eb054b34a
Document non-obvious usages.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4410
diff
changeset
|
912 /* -1.0 signals make_general_lisp_hash_table to use the default. */ |
| 428 | 913 return NILP (rehash_threshold) ? -1.0 : XFLOAT_DATA (rehash_threshold); |
| 914 } | |
| 915 | |
| 916 static int | |
| 2286 | 917 hash_table_data_validate (Lisp_Object UNUSED (keyword), Lisp_Object value, |
| 918 Error_Behavior errb) | |
| 428 | 919 { |
| 920 int len; | |
| 921 | |
|
4585
871eb054b34a
Document non-obvious usages.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4410
diff
changeset
|
922 /* Check for improper lists while getting length. */ |
| 428 | 923 GET_EXTERNAL_LIST_LENGTH (value, len); |
| 924 | |
| 925 if (len & 1) | |
| 926 { | |
| 563 | 927 maybe_sferror |
| 428 | 928 ("Hash table data must have alternating key/value pairs", |
| 929 value, Qhash_table, errb); | |
| 930 return 0; | |
| 931 } | |
|
4585
871eb054b34a
Document non-obvious usages.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4410
diff
changeset
|
932 |
| 428 | 933 return 1; |
| 934 } | |
| 935 | |
| 936 /* The actual instantiation of a hash table. This does practically no | |
| 937 error checking, because it relies on the fact that the paranoid | |
| 938 functions above have error-checked everything to the last details. | |
| 939 If this assumption is wrong, we will get a crash immediately (with | |
| 940 error-checking compiled in), and we'll know if there is a bug in | |
| 941 the structure mechanism. So there. */ | |
| 942 static Lisp_Object | |
| 943 hash_table_instantiate (Lisp_Object plist) | |
| 944 { | |
| 945 Lisp_Object hash_table; | |
| 946 Lisp_Object test = Qnil; | |
| 947 Lisp_Object size = Qnil; | |
| 948 Lisp_Object rehash_size = Qnil; | |
| 949 Lisp_Object rehash_threshold = Qnil; | |
| 950 Lisp_Object weakness = Qnil; | |
| 951 Lisp_Object data = Qnil; | |
| 952 | |
|
4820
e6dec75ded0e
Use keywords, not ordinary symbols, in the structure syntax for hash tables.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4779
diff
changeset
|
953 if (KEYWORDP (Fcar (plist))) |
| 428 | 954 { |
|
4820
e6dec75ded0e
Use keywords, not ordinary symbols, in the structure syntax for hash tables.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4779
diff
changeset
|
955 PROPERTY_LIST_LOOP_3 (key, value, plist) |
|
e6dec75ded0e
Use keywords, not ordinary symbols, in the structure syntax for hash tables.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4779
diff
changeset
|
956 { |
|
e6dec75ded0e
Use keywords, not ordinary symbols, in the structure syntax for hash tables.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4779
diff
changeset
|
957 if (EQ (key, Q_test)) test = value; |
|
e6dec75ded0e
Use keywords, not ordinary symbols, in the structure syntax for hash tables.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4779
diff
changeset
|
958 else if (EQ (key, Q_size)) size = value; |
|
e6dec75ded0e
Use keywords, not ordinary symbols, in the structure syntax for hash tables.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4779
diff
changeset
|
959 else if (EQ (key, Q_rehash_size)) rehash_size = value; |
|
e6dec75ded0e
Use keywords, not ordinary symbols, in the structure syntax for hash tables.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4779
diff
changeset
|
960 else if (EQ (key, Q_rehash_threshold)) rehash_threshold = value; |
|
e6dec75ded0e
Use keywords, not ordinary symbols, in the structure syntax for hash tables.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4779
diff
changeset
|
961 else if (EQ (key, Q_weakness)) weakness = value; |
|
e6dec75ded0e
Use keywords, not ordinary symbols, in the structure syntax for hash tables.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4779
diff
changeset
|
962 else if (EQ (key, Q_data)) data = value; |
|
e6dec75ded0e
Use keywords, not ordinary symbols, in the structure syntax for hash tables.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4779
diff
changeset
|
963 else if (!KEYWORDP (key)) |
|
e6dec75ded0e
Use keywords, not ordinary symbols, in the structure syntax for hash tables.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4779
diff
changeset
|
964 signal_error (Qinvalid_read_syntax, |
|
e6dec75ded0e
Use keywords, not ordinary symbols, in the structure syntax for hash tables.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4779
diff
changeset
|
965 "can't mix keyword and non-keyword hash table syntax", |
|
e6dec75ded0e
Use keywords, not ordinary symbols, in the structure syntax for hash tables.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4779
diff
changeset
|
966 key); |
|
e6dec75ded0e
Use keywords, not ordinary symbols, in the structure syntax for hash tables.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4779
diff
changeset
|
967 else ABORT(); |
|
e6dec75ded0e
Use keywords, not ordinary symbols, in the structure syntax for hash tables.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4779
diff
changeset
|
968 } |
|
e6dec75ded0e
Use keywords, not ordinary symbols, in the structure syntax for hash tables.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4779
diff
changeset
|
969 } |
|
e6dec75ded0e
Use keywords, not ordinary symbols, in the structure syntax for hash tables.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4779
diff
changeset
|
970 else |
|
e6dec75ded0e
Use keywords, not ordinary symbols, in the structure syntax for hash tables.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4779
diff
changeset
|
971 { |
|
e6dec75ded0e
Use keywords, not ordinary symbols, in the structure syntax for hash tables.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4779
diff
changeset
|
972 PROPERTY_LIST_LOOP_3 (key, value, plist) |
|
e6dec75ded0e
Use keywords, not ordinary symbols, in the structure syntax for hash tables.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4779
diff
changeset
|
973 { |
|
e6dec75ded0e
Use keywords, not ordinary symbols, in the structure syntax for hash tables.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4779
diff
changeset
|
974 if (EQ (key, Qtest)) test = value; |
|
e6dec75ded0e
Use keywords, not ordinary symbols, in the structure syntax for hash tables.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4779
diff
changeset
|
975 else if (EQ (key, Qsize)) size = value; |
|
e6dec75ded0e
Use keywords, not ordinary symbols, in the structure syntax for hash tables.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4779
diff
changeset
|
976 else if (EQ (key, Qrehash_size)) rehash_size = value; |
|
e6dec75ded0e
Use keywords, not ordinary symbols, in the structure syntax for hash tables.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4779
diff
changeset
|
977 else if (EQ (key, Qrehash_threshold)) rehash_threshold = value; |
|
e6dec75ded0e
Use keywords, not ordinary symbols, in the structure syntax for hash tables.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4779
diff
changeset
|
978 else if (EQ (key, Qweakness)) weakness = value; |
|
e6dec75ded0e
Use keywords, not ordinary symbols, in the structure syntax for hash tables.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4779
diff
changeset
|
979 else if (EQ (key, Qdata)) data = value; |
|
5277
d804e621add0
Simplify the API of PARSE_KEYWORDS for callers.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5232
diff
changeset
|
980 #ifdef NEED_TO_HANDLE_21_4_CODE |
|
4820
e6dec75ded0e
Use keywords, not ordinary symbols, in the structure syntax for hash tables.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4779
diff
changeset
|
981 else if (EQ (key, Qtype))/*obsolete*/ weakness = value; |
|
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
982 #endif |
|
4820
e6dec75ded0e
Use keywords, not ordinary symbols, in the structure syntax for hash tables.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4779
diff
changeset
|
983 else if (KEYWORDP (key)) |
|
e6dec75ded0e
Use keywords, not ordinary symbols, in the structure syntax for hash tables.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4779
diff
changeset
|
984 signal_error (Qinvalid_read_syntax, |
|
e6dec75ded0e
Use keywords, not ordinary symbols, in the structure syntax for hash tables.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4779
diff
changeset
|
985 "can't mix keyword and non-keyword hash table syntax", |
|
e6dec75ded0e
Use keywords, not ordinary symbols, in the structure syntax for hash tables.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4779
diff
changeset
|
986 key); |
|
e6dec75ded0e
Use keywords, not ordinary symbols, in the structure syntax for hash tables.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4779
diff
changeset
|
987 else ABORT(); |
|
e6dec75ded0e
Use keywords, not ordinary symbols, in the structure syntax for hash tables.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4779
diff
changeset
|
988 } |
| 428 | 989 } |
| 990 | |
| 991 /* Create the hash table. */ | |
|
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
992 hash_table = make_general_lisp_hash_table |
| 428 | 993 (decode_hash_table_test (test), |
| 994 decode_hash_table_size (size), | |
| 995 decode_hash_table_rehash_size (rehash_size), | |
| 996 decode_hash_table_rehash_threshold (rehash_threshold), | |
| 997 decode_hash_table_weakness (weakness)); | |
| 998 | |
|
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
999 /* This can GC with a user-specified test. */ |
| 428 | 1000 { |
| 1001 struct gcpro gcpro1; | |
| 1002 GCPRO1 (hash_table); | |
| 1003 | |
| 1004 /* And fill it with data. */ | |
| 1005 while (!NILP (data)) | |
| 1006 { | |
| 1007 Lisp_Object key, value; | |
| 1008 key = XCAR (data); data = XCDR (data); | |
| 1009 value = XCAR (data); data = XCDR (data); | |
| 1010 Fputhash (key, value, hash_table); | |
| 1011 } | |
| 1012 UNGCPRO; | |
| 1013 } | |
| 1014 | |
| 1015 return hash_table; | |
| 1016 } | |
| 1017 | |
| 1018 static void | |
| 1019 structure_type_create_hash_table_structure_name (Lisp_Object structure_name) | |
| 1020 { | |
| 1021 struct structure_type *st; | |
| 1022 | |
| 1023 st = define_structure_type (structure_name, 0, hash_table_instantiate); | |
|
4820
e6dec75ded0e
Use keywords, not ordinary symbols, in the structure syntax for hash tables.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4779
diff
changeset
|
1024 |
|
e6dec75ded0e
Use keywords, not ordinary symbols, in the structure syntax for hash tables.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4779
diff
changeset
|
1025 /* First the keyword syntax: */ |
|
e6dec75ded0e
Use keywords, not ordinary symbols, in the structure syntax for hash tables.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4779
diff
changeset
|
1026 define_structure_type_keyword (st, Q_test, hash_table_test_validate); |
|
e6dec75ded0e
Use keywords, not ordinary symbols, in the structure syntax for hash tables.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4779
diff
changeset
|
1027 define_structure_type_keyword (st, Q_size, hash_table_size_validate); |
|
e6dec75ded0e
Use keywords, not ordinary symbols, in the structure syntax for hash tables.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4779
diff
changeset
|
1028 define_structure_type_keyword (st, Q_rehash_size, hash_table_rehash_size_validate); |
|
e6dec75ded0e
Use keywords, not ordinary symbols, in the structure syntax for hash tables.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4779
diff
changeset
|
1029 define_structure_type_keyword (st, Q_rehash_threshold, hash_table_rehash_threshold_validate); |
|
e6dec75ded0e
Use keywords, not ordinary symbols, in the structure syntax for hash tables.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4779
diff
changeset
|
1030 define_structure_type_keyword (st, Q_weakness, hash_table_weakness_validate); |
|
e6dec75ded0e
Use keywords, not ordinary symbols, in the structure syntax for hash tables.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4779
diff
changeset
|
1031 define_structure_type_keyword (st, Q_data, hash_table_data_validate); |
|
e6dec75ded0e
Use keywords, not ordinary symbols, in the structure syntax for hash tables.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4779
diff
changeset
|
1032 |
|
5222
18c0b5909d16
Use keywords in structure syntax; new #define, NEED_TO_HANDLE_21_4_CODE 1
Aidan Kehoe <kehoea@parhasard.net>
parents:
5193
diff
changeset
|
1033 #ifdef NEED_TO_HANDLE_21_4_CODE |
|
4820
e6dec75ded0e
Use keywords, not ordinary symbols, in the structure syntax for hash tables.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4779
diff
changeset
|
1034 /* Next the mutually exclusive, older, non-keyword syntax: */ |
| 428 | 1035 define_structure_type_keyword (st, Qtest, hash_table_test_validate); |
| 1036 define_structure_type_keyword (st, Qsize, hash_table_size_validate); | |
| 1037 define_structure_type_keyword (st, Qrehash_size, hash_table_rehash_size_validate); | |
| 1038 define_structure_type_keyword (st, Qrehash_threshold, hash_table_rehash_threshold_validate); | |
| 1039 define_structure_type_keyword (st, Qweakness, hash_table_weakness_validate); | |
| 1040 define_structure_type_keyword (st, Qdata, hash_table_data_validate); | |
| 1041 | |
| 1042 /* obsolete as of 19990901 in xemacs-21.2 */ | |
| 1043 define_structure_type_keyword (st, Qtype, hash_table_weakness_validate); | |
|
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1044 #endif |
| 428 | 1045 } |
| 1046 | |
| 1047 /* Create a built-in Lisp structure type named `hash-table'. | |
| 1048 We make #s(hashtable ...) equivalent to #s(hash-table ...), | |
| 1049 for backward compatibility. | |
| 1050 This is called from emacs.c. */ | |
| 1051 void | |
| 1052 structure_type_create_hash_table (void) | |
| 1053 { | |
| 1054 structure_type_create_hash_table_structure_name (Qhash_table); | |
|
5222
18c0b5909d16
Use keywords in structure syntax; new #define, NEED_TO_HANDLE_21_4_CODE 1
Aidan Kehoe <kehoea@parhasard.net>
parents:
5193
diff
changeset
|
1055 #ifdef NEED_TO_HANDLE_21_4_CODE |
| 428 | 1056 structure_type_create_hash_table_structure_name (Qhashtable); /* compat */ |
|
5222
18c0b5909d16
Use keywords in structure syntax; new #define, NEED_TO_HANDLE_21_4_CODE 1
Aidan Kehoe <kehoea@parhasard.net>
parents:
5193
diff
changeset
|
1057 #endif |
| 428 | 1058 } |
| 1059 | |
| 1060 | |
| 1061 /************************************************************************/ | |
| 1062 /* Definition of Lisp-visible methods */ | |
| 1063 /************************************************************************/ | |
| 1064 | |
| 1065 DEFUN ("hash-table-p", Fhash_table_p, 1, 1, 0, /* | |
| 1066 Return t if OBJECT is a hash table, else nil. | |
| 1067 */ | |
| 1068 (object)) | |
| 1069 { | |
| 1070 return HASH_TABLEP (object) ? Qt : Qnil; | |
| 1071 } | |
| 1072 | |
| 1073 DEFUN ("make-hash-table", Fmake_hash_table, 0, MANY, 0, /* | |
| 1074 Return a new empty hash table object. | |
| 1075 Use Common Lisp style keywords to specify hash table properties. | |
| 1076 | |
|
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1077 Keyword :test can be `eq', `eql' (default), `equal' or `equalp'. |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1078 Comparison between keys is done using this function. If speed is important, |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1079 consider using `eq'. When storing strings in the hash table, you will |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1080 likely need to use `equal' or `equalp' (for case-insensitivity). With other |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1081 objects, consider using a test function defined with |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1082 `define-hash-table-test', an emacs extension to this Common Lisp hash table |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1083 API. |
| 428 | 1084 |
| 1085 Keyword :size specifies the number of keys likely to be inserted. | |
| 1086 This number of entries can be inserted without enlarging the hash table. | |
| 1087 | |
| 1088 Keyword :rehash-size must be a float greater than 1.0, and specifies | |
| 1089 the factor by which to increase the size of the hash table when enlarging. | |
| 1090 | |
| 1091 Keyword :rehash-threshold must be a float between 0.0 and 1.0, | |
| 1092 and specifies the load factor of the hash table which triggers enlarging. | |
| 1093 | |
| 442 | 1094 Non-standard keyword :weakness can be `nil' (default), `t', `key-and-value', |
| 1095 `key', `value' or `key-or-value'. `t' is an alias for `key-and-value'. | |
| 428 | 1096 |
| 442 | 1097 A key-and-value-weak hash table, also known as a fully-weak or simply |
| 1098 as a weak hash table, is one whose pointers do not count as GC | |
| 1099 referents: for any key-value pair in the hash table, if the only | |
| 1100 remaining pointer to either the key or the value is in a weak hash | |
| 1101 table, then the pair will be removed from the hash table, and the key | |
| 1102 and value collected. A non-weak hash table (or any other pointer) | |
| 1103 would prevent the object from being collected. | |
| 428 | 1104 |
| 1105 A key-weak hash table is similar to a fully-weak hash table except that | |
| 1106 a key-value pair will be removed only if the key remains unmarked | |
| 1107 outside of weak hash tables. The pair will remain in the hash table if | |
| 1108 the key is pointed to by something other than a weak hash table, even | |
| 1109 if the value is not. | |
| 1110 | |
| 1111 A value-weak hash table is similar to a fully-weak hash table except | |
| 1112 that a key-value pair will be removed only if the value remains | |
| 1113 unmarked outside of weak hash tables. The pair will remain in the | |
| 1114 hash table if the value is pointed to by something other than a weak | |
| 1115 hash table, even if the key is not. | |
| 442 | 1116 |
| 1117 A key-or-value-weak hash table is similar to a fully-weak hash table except | |
| 1118 that a key-value pair will be removed only if the value and the key remain | |
| 1119 unmarked outside of weak hash tables. The pair will remain in the | |
| 1120 hash table if the value or key are pointed to by something other than a weak | |
| 1121 hash table, even if the other is not. | |
|
4693
80cd90837ac5
Add argument information to remaining MANY or UNEVALLED C subrs.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4585
diff
changeset
|
1122 |
|
4777
c69aeb86b2a3
Serialise non-default hash table rehash thresholds correctly; use this.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4693
diff
changeset
|
1123 arguments: (&key TEST SIZE REHASH-SIZE REHASH-THRESHOLD WEAKNESS) |
| 428 | 1124 */ |
| 1125 (int nargs, Lisp_Object *args)) | |
| 1126 { | |
|
5277
d804e621add0
Simplify the API of PARSE_KEYWORDS for callers.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5232
diff
changeset
|
1127 #ifndef NEED_TO_HANDLE_21_4_CODE |
|
d804e621add0
Simplify the API of PARSE_KEYWORDS for callers.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5232
diff
changeset
|
1128 PARSE_KEYWORDS (Fmake_hash_table, nargs, args, 5, |
|
5084
6afe991b8135
Add a PARSE_KEYWORDS macro, use it in #'make-hash-table.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4976
diff
changeset
|
1129 (test, size, rehash_size, rehash_threshold, weakness), |
|
5277
d804e621add0
Simplify the API of PARSE_KEYWORDS for callers.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5232
diff
changeset
|
1130 NULL); |
|
5084
6afe991b8135
Add a PARSE_KEYWORDS macro, use it in #'make-hash-table.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4976
diff
changeset
|
1131 #else |
|
5277
d804e621add0
Simplify the API of PARSE_KEYWORDS for callers.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5232
diff
changeset
|
1132 PARSE_KEYWORDS (Fmake_hash_table, nargs, args, 6, |
|
5084
6afe991b8135
Add a PARSE_KEYWORDS macro, use it in #'make-hash-table.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4976
diff
changeset
|
1133 (test, size, rehash_size, rehash_threshold, weakness, |
|
5277
d804e621add0
Simplify the API of PARSE_KEYWORDS for callers.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5232
diff
changeset
|
1134 type), (type = Qunbound, weakness = Qunbound)); |
| 428 | 1135 |
|
5084
6afe991b8135
Add a PARSE_KEYWORDS macro, use it in #'make-hash-table.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4976
diff
changeset
|
1136 if (EQ (weakness, Qunbound)) |
|
6afe991b8135
Add a PARSE_KEYWORDS macro, use it in #'make-hash-table.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4976
diff
changeset
|
1137 { |
|
6afe991b8135
Add a PARSE_KEYWORDS macro, use it in #'make-hash-table.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4976
diff
changeset
|
1138 if (EQ (weakness, Qunbound) && !EQ (type, Qunbound)) |
|
6afe991b8135
Add a PARSE_KEYWORDS macro, use it in #'make-hash-table.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4976
diff
changeset
|
1139 { |
|
6afe991b8135
Add a PARSE_KEYWORDS macro, use it in #'make-hash-table.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4976
diff
changeset
|
1140 weakness = type; |
|
6afe991b8135
Add a PARSE_KEYWORDS macro, use it in #'make-hash-table.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4976
diff
changeset
|
1141 } |
|
6afe991b8135
Add a PARSE_KEYWORDS macro, use it in #'make-hash-table.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4976
diff
changeset
|
1142 else |
|
6afe991b8135
Add a PARSE_KEYWORDS macro, use it in #'make-hash-table.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4976
diff
changeset
|
1143 { |
|
6afe991b8135
Add a PARSE_KEYWORDS macro, use it in #'make-hash-table.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4976
diff
changeset
|
1144 weakness = Qnil; |
|
6afe991b8135
Add a PARSE_KEYWORDS macro, use it in #'make-hash-table.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4976
diff
changeset
|
1145 } |
| 428 | 1146 } |
|
5084
6afe991b8135
Add a PARSE_KEYWORDS macro, use it in #'make-hash-table.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4976
diff
changeset
|
1147 #endif |
| 428 | 1148 |
| 1149 #define VALIDATE_VAR(var) \ | |
| 1150 if (!NILP (var)) hash_table_##var##_validate (Q##var, var, ERROR_ME); | |
| 1151 | |
| 1152 VALIDATE_VAR (test); | |
| 1153 VALIDATE_VAR (size); | |
| 1154 VALIDATE_VAR (rehash_size); | |
| 1155 VALIDATE_VAR (rehash_threshold); | |
| 1156 VALIDATE_VAR (weakness); | |
| 1157 | |
|
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1158 return make_general_lisp_hash_table |
| 428 | 1159 (decode_hash_table_test (test), |
| 1160 decode_hash_table_size (size), | |
| 1161 decode_hash_table_rehash_size (rehash_size), | |
| 1162 decode_hash_table_rehash_threshold (rehash_threshold), | |
| 1163 decode_hash_table_weakness (weakness)); | |
| 1164 } | |
| 1165 | |
| 1166 DEFUN ("copy-hash-table", Fcopy_hash_table, 1, 1, 0, /* | |
| 1167 Return a new hash table containing the same keys and values as HASH-TABLE. | |
| 1168 The keys and values will not themselves be copied. | |
| 1169 */ | |
| 1170 (hash_table)) | |
| 1171 { | |
| 442 | 1172 const Lisp_Hash_Table *ht_old = xhash_table (hash_table); |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5125
diff
changeset
|
1173 Lisp_Object obj = ALLOC_NORMAL_LISP_OBJECT (hash_table); |
|
5117
3742ea8250b5
Checking in final CVS version of workspace 'ben-lisp-object'
Ben Wing <ben@xemacs.org>
parents:
3017
diff
changeset
|
1174 Lisp_Hash_Table *ht = XHASH_TABLE (obj); |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5125
diff
changeset
|
1175 copy_lisp_object (obj, hash_table); |
| 428 | 1176 |
|
5118
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
1177 /* We leave room for one never-occupied sentinel htentry at the end. */ |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
1178 ht->hentries = allocate_hash_table_entries (ht_old->size + 1); |
| 1204 | 1179 memcpy (ht->hentries, ht_old->hentries, (ht_old->size + 1) * sizeof (htentry)); |
| 428 | 1180 |
| 1181 if (! EQ (ht->next_weak, Qunbound)) | |
| 1182 { | |
| 1183 ht->next_weak = Vall_weak_hash_tables; | |
|
5117
3742ea8250b5
Checking in final CVS version of workspace 'ben-lisp-object'
Ben Wing <ben@xemacs.org>
parents:
3017
diff
changeset
|
1184 Vall_weak_hash_tables = obj; |
| 428 | 1185 } |
| 1186 | |
|
5117
3742ea8250b5
Checking in final CVS version of workspace 'ben-lisp-object'
Ben Wing <ben@xemacs.org>
parents:
3017
diff
changeset
|
1187 return obj; |
| 428 | 1188 } |
| 1189 | |
| 1190 static void | |
| 665 | 1191 resize_hash_table (Lisp_Hash_Table *ht, Elemcount new_size) |
| 428 | 1192 { |
| 1204 | 1193 htentry *old_entries, *new_entries, *sentinel, *e; |
| 665 | 1194 Elemcount old_size; |
|
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1195 Hash_Table_Test *http = XHASH_TABLE_TEST (ht->test); |
| 428 | 1196 |
| 1197 old_size = ht->size; | |
| 1198 ht->size = new_size; | |
| 1199 | |
| 1200 old_entries = ht->hentries; | |
| 1201 | |
|
5118
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
1202 /* We leave room for one never-occupied sentinel htentry at the end. */ |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
1203 ht->hentries = allocate_hash_table_entries (new_size + 1); |
| 428 | 1204 new_entries = ht->hentries; |
| 1205 | |
| 1206 compute_hash_table_derived_values (ht); | |
| 1207 | |
| 440 | 1208 for (e = old_entries, sentinel = e + old_size; e < sentinel; e++) |
| 1204 | 1209 if (!HTENTRY_CLEAR_P (e)) |
| 428 | 1210 { |
|
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1211 htentry *probe = new_entries + HASHCODE (e->key, ht, http); |
| 428 | 1212 LINEAR_PROBING_LOOP (probe, new_entries, new_size) |
| 1213 ; | |
| 1214 *probe = *e; | |
| 1215 } | |
| 1216 | |
| 4117 | 1217 #ifndef NEW_GC |
| 489 | 1218 free_hentries (old_entries, old_size); |
| 4117 | 1219 #endif /* not NEW_GC */ |
| 428 | 1220 } |
| 1221 | |
| 440 | 1222 /* After a hash table has been saved to disk and later restored by the |
| 1223 portable dumper, it contains the same objects, but their addresses | |
| 665 | 1224 and thus their HASHCODEs have changed. */ |
| 428 | 1225 void |
| 440 | 1226 pdump_reorganize_hash_table (Lisp_Object hash_table) |
| 428 | 1227 { |
| 442 | 1228 const Lisp_Hash_Table *ht = xhash_table (hash_table); |
|
5118
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
1229 /* We leave room for one never-occupied sentinel htentry at the end. */ |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
1230 htentry *new_entries = allocate_hash_table_entries (ht->size + 1); |
| 1204 | 1231 htentry *e, *sentinel; |
|
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1232 Hash_Table_Test *http = XHASH_TABLE_TEST (ht->test); |
| 440 | 1233 |
| 1234 for (e = ht->hentries, sentinel = e + ht->size; e < sentinel; e++) | |
| 1204 | 1235 if (!HTENTRY_CLEAR_P (e)) |
| 440 | 1236 { |
|
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1237 htentry *probe = new_entries + HASHCODE (e->key, ht, http); |
| 440 | 1238 LINEAR_PROBING_LOOP (probe, new_entries, ht->size) |
| 1239 ; | |
| 1240 *probe = *e; | |
| 1241 } | |
| 1242 | |
| 1204 | 1243 memcpy (ht->hentries, new_entries, ht->size * sizeof (htentry)); |
| 440 | 1244 |
| 4117 | 1245 #ifndef NEW_GC |
|
4976
16112448d484
Rename xfree(FOO, TYPE) -> xfree(FOO)
Ben Wing <ben@xemacs.org>
parents:
4962
diff
changeset
|
1246 xfree (new_entries); |
| 3092 | 1247 #endif /* not NEW_GC */ |
| 428 | 1248 } |
| 1249 | |
| 1250 static void | |
| 1251 enlarge_hash_table (Lisp_Hash_Table *ht) | |
| 1252 { | |
| 665 | 1253 Elemcount new_size = |
| 1254 hash_table_size ((Elemcount) ((double) ht->size * ht->rehash_size)); | |
| 428 | 1255 resize_hash_table (ht, new_size); |
| 1256 } | |
| 1257 | |
| 4072 | 1258 htentry * |
| 1204 | 1259 find_htentry (Lisp_Object key, const Lisp_Hash_Table *ht) |
| 428 | 1260 { |
|
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1261 Lisp_Object test = ht->test; |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1262 Hash_Table_Test *http = XHASH_TABLE_TEST (test); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1263 |
| 1204 | 1264 htentry *entries = ht->hentries; |
|
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1265 htentry *probe = entries + HASHCODE (key, ht, http); |
| 428 | 1266 |
| 1267 LINEAR_PROBING_LOOP (probe, entries, ht->size) | |
|
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1268 if (KEYS_EQUAL_P (probe->key, key, test, http)) |
| 428 | 1269 break; |
| 1270 | |
| 1271 return probe; | |
| 1272 } | |
| 1273 | |
| 2421 | 1274 /* A version of Fputhash() that increments the value by the specified |
|
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1275 amount and dispenses with all error checks. Assumes that tables does |
| 2421 | 1276 comparison using EQ. Used by the profiling routines to avoid |
| 1277 overhead -- profiling overhead was being recorded at up to 15% of the | |
| 1278 total time. */ | |
| 1279 | |
| 1280 void | |
| 1281 inchash_eq (Lisp_Object key, Lisp_Object table, EMACS_INT offset) | |
| 1282 { | |
| 1283 Lisp_Hash_Table *ht = XHASH_TABLE (table); | |
|
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1284 Hash_Table_Test *http = XHASH_TABLE_TEST (ht->test); |
| 2421 | 1285 htentry *entries = ht->hentries; |
|
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1286 htentry *probe = entries + HASHCODE (key, ht, http); |
| 2421 | 1287 |
| 1288 LINEAR_PROBING_LOOP (probe, entries, ht->size) | |
| 1289 if (EQ (probe->key, key)) | |
| 1290 break; | |
| 1291 | |
| 1292 if (!HTENTRY_CLEAR_P (probe)) | |
| 1293 probe->value = make_int (XINT (probe->value) + offset); | |
| 1294 else | |
| 1295 { | |
| 1296 probe->key = key; | |
| 1297 probe->value = make_int (offset); | |
| 1298 | |
| 1299 if (++ht->count >= ht->rehash_count) | |
| 1300 enlarge_hash_table (ht); | |
| 1301 } | |
| 1302 } | |
| 1303 | |
| 428 | 1304 DEFUN ("gethash", Fgethash, 2, 3, 0, /* |
| 1305 Find hash value for KEY in HASH-TABLE. | |
| 1306 If there is no corresponding value, return DEFAULT (which defaults to nil). | |
| 1307 */ | |
| 1308 (key, hash_table, default_)) | |
| 1309 { | |
| 442 | 1310 const Lisp_Hash_Table *ht = xhash_table (hash_table); |
| 1204 | 1311 htentry *e = find_htentry (key, ht); |
| 428 | 1312 |
| 1204 | 1313 return HTENTRY_CLEAR_P (e) ? default_ : e->value; |
| 428 | 1314 } |
| 1315 | |
| 1316 DEFUN ("puthash", Fputhash, 3, 3, 0, /* | |
|
4410
aae1994dfeec
Document return values for #'puthash, #'clrhash.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4398
diff
changeset
|
1317 Hash KEY to VALUE in HASH-TABLE, and return VALUE. |
| 428 | 1318 */ |
| 1319 (key, value, hash_table)) | |
| 1320 { | |
| 1321 Lisp_Hash_Table *ht = xhash_table (hash_table); | |
| 1204 | 1322 htentry *e = find_htentry (key, ht); |
| 428 | 1323 |
| 1204 | 1324 if (!HTENTRY_CLEAR_P (e)) |
| 428 | 1325 return e->value = value; |
| 1326 | |
| 1327 e->key = key; | |
| 1328 e->value = value; | |
| 1329 | |
| 1330 if (++ht->count >= ht->rehash_count) | |
| 1331 enlarge_hash_table (ht); | |
| 1332 | |
| 1333 return value; | |
| 1334 } | |
| 1335 | |
| 1204 | 1336 /* Remove htentry pointed at by PROBE. |
| 428 | 1337 Subsequent entries are removed and reinserted. |
| 1338 We don't use tombstones - too wasteful. */ | |
| 1339 static void | |
| 1204 | 1340 remhash_1 (Lisp_Hash_Table *ht, htentry *entries, htentry *probe) |
| 428 | 1341 { |
|
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1342 Hash_Table_Test *http = XHASH_TABLE_TEST (ht->test); |
| 665 | 1343 Elemcount size = ht->size; |
| 1204 | 1344 CLEAR_HTENTRY (probe); |
| 428 | 1345 probe++; |
| 1346 ht->count--; | |
| 1347 | |
| 1348 LINEAR_PROBING_LOOP (probe, entries, size) | |
| 1349 { | |
| 1350 Lisp_Object key = probe->key; | |
|
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1351 htentry *probe2 = entries + HASHCODE (key, ht, http); |
| 428 | 1352 LINEAR_PROBING_LOOP (probe2, entries, size) |
| 1353 if (EQ (probe2->key, key)) | |
| 1204 | 1354 /* htentry at probe doesn't need to move. */ |
| 428 | 1355 goto continue_outer_loop; |
| 1204 | 1356 /* Move htentry from probe to new home at probe2. */ |
| 428 | 1357 *probe2 = *probe; |
| 1204 | 1358 CLEAR_HTENTRY (probe); |
| 428 | 1359 continue_outer_loop: continue; |
| 1360 } | |
| 1361 } | |
| 1362 | |
| 1363 DEFUN ("remhash", Fremhash, 2, 2, 0, /* | |
| 1364 Remove the entry for KEY from HASH-TABLE. | |
| 1365 Do nothing if there is no entry for KEY in HASH-TABLE. | |
| 617 | 1366 Return non-nil if an entry was removed. |
| 428 | 1367 */ |
| 1368 (key, hash_table)) | |
| 1369 { | |
| 1370 Lisp_Hash_Table *ht = xhash_table (hash_table); | |
| 1204 | 1371 htentry *e = find_htentry (key, ht); |
| 428 | 1372 |
| 1204 | 1373 if (HTENTRY_CLEAR_P (e)) |
| 428 | 1374 return Qnil; |
| 1375 | |
| 1376 remhash_1 (ht, ht->hentries, e); | |
| 1377 return Qt; | |
| 1378 } | |
| 1379 | |
| 1380 DEFUN ("clrhash", Fclrhash, 1, 1, 0, /* | |
| 1381 Remove all entries from HASH-TABLE, leaving it empty. | |
|
4410
aae1994dfeec
Document return values for #'puthash, #'clrhash.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4398
diff
changeset
|
1382 Return HASH-TABLE. |
| 428 | 1383 */ |
| 1384 (hash_table)) | |
| 1385 { | |
| 1386 Lisp_Hash_Table *ht = xhash_table (hash_table); | |
| 1204 | 1387 htentry *e, *sentinel; |
| 428 | 1388 |
| 1389 for (e = ht->hentries, sentinel = e + ht->size; e < sentinel; e++) | |
| 1204 | 1390 CLEAR_HTENTRY (e); |
| 428 | 1391 ht->count = 0; |
| 1392 | |
| 1393 return hash_table; | |
| 1394 } | |
| 1395 | |
| 1396 /************************************************************************/ | |
| 1397 /* Accessor Functions */ | |
| 1398 /************************************************************************/ | |
| 1399 | |
| 1400 DEFUN ("hash-table-count", Fhash_table_count, 1, 1, 0, /* | |
| 1401 Return the number of entries in HASH-TABLE. | |
| 1402 */ | |
| 1403 (hash_table)) | |
| 1404 { | |
| 1405 return make_int (xhash_table (hash_table)->count); | |
| 1406 } | |
| 1407 | |
| 1408 DEFUN ("hash-table-test", Fhash_table_test, 1, 1, 0, /* | |
|
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1409 Return HASH-TABLE's test. |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1410 |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1411 This can be one of `eq', `eql', `equal', `equalp', or some symbol supplied |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1412 as the NAME argument to `define-hash-table-test', which see. |
| 428 | 1413 */ |
| 1414 (hash_table)) | |
| 1415 { | |
|
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1416 CHECK_HASH_TABLE (hash_table); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1417 return XHASH_TABLE_TEST (XHASH_TABLE (hash_table)->test)->name; |
| 428 | 1418 } |
| 1419 | |
| 1420 DEFUN ("hash-table-size", Fhash_table_size, 1, 1, 0, /* | |
| 1421 Return the size of HASH-TABLE. | |
| 1422 This is the current number of slots in HASH-TABLE, whether occupied or not. | |
| 1423 */ | |
| 1424 (hash_table)) | |
| 1425 { | |
| 1426 return make_int (xhash_table (hash_table)->size); | |
| 1427 } | |
| 1428 | |
| 1429 DEFUN ("hash-table-rehash-size", Fhash_table_rehash_size, 1, 1, 0, /* | |
| 1430 Return the current rehash size of HASH-TABLE. | |
| 1431 This is a float greater than 1.0; the factor by which HASH-TABLE | |
| 1432 is enlarged when the rehash threshold is exceeded. | |
| 1433 */ | |
| 1434 (hash_table)) | |
| 1435 { | |
| 1436 return make_float (xhash_table (hash_table)->rehash_size); | |
| 1437 } | |
| 1438 | |
| 1439 DEFUN ("hash-table-rehash-threshold", Fhash_table_rehash_threshold, 1, 1, 0, /* | |
| 1440 Return the current rehash threshold of HASH-TABLE. | |
| 1441 This is a float between 0.0 and 1.0; the maximum `load factor' of HASH-TABLE, | |
| 1442 beyond which the HASH-TABLE is enlarged by rehashing. | |
| 1443 */ | |
| 1444 (hash_table)) | |
| 1445 { | |
| 438 | 1446 return make_float (xhash_table (hash_table)->rehash_threshold); |
| 428 | 1447 } |
| 1448 | |
| 1449 DEFUN ("hash-table-weakness", Fhash_table_weakness, 1, 1, 0, /* | |
| 1450 Return the weakness of HASH-TABLE. | |
| 442 | 1451 This can be one of `nil', `key-and-value', `key-or-value', `key' or `value'. |
| 428 | 1452 */ |
| 1453 (hash_table)) | |
| 1454 { | |
| 1455 switch (xhash_table (hash_table)->weakness) | |
| 1456 { | |
| 442 | 1457 case HASH_TABLE_WEAK: return Qkey_and_value; |
| 1458 case HASH_TABLE_KEY_WEAK: return Qkey; | |
| 1459 case HASH_TABLE_KEY_VALUE_WEAK: return Qkey_or_value; | |
| 1460 case HASH_TABLE_VALUE_WEAK: return Qvalue; | |
| 1461 default: return Qnil; | |
| 428 | 1462 } |
| 1463 } | |
| 1464 | |
| 1465 /* obsolete as of 19990901 in xemacs-21.2 */ | |
| 1466 DEFUN ("hash-table-type", Fhash_table_type, 1, 1, 0, /* | |
| 1467 Return the type of HASH-TABLE. | |
| 1468 This can be one of `non-weak', `weak', `key-weak' or `value-weak'. | |
| 1469 */ | |
| 1470 (hash_table)) | |
| 1471 { | |
| 1472 switch (xhash_table (hash_table)->weakness) | |
| 1473 { | |
| 442 | 1474 case HASH_TABLE_WEAK: return Qweak; |
| 1475 case HASH_TABLE_KEY_WEAK: return Qkey_weak; | |
| 1476 case HASH_TABLE_KEY_VALUE_WEAK: return Qkey_or_value_weak; | |
| 1477 case HASH_TABLE_VALUE_WEAK: return Qvalue_weak; | |
| 1478 default: return Qnon_weak; | |
| 428 | 1479 } |
| 1480 } | |
| 1481 | |
| 1482 /************************************************************************/ | |
| 1483 /* Mapping Functions */ | |
| 1484 /************************************************************************/ | |
| 489 | 1485 |
| 1486 /* We need to be careful when mapping over hash tables because the | |
| 1487 hash table might be modified during the mapping operation: | |
| 1488 - by the mapping function | |
| 1489 - by gc (if the hash table is weak) | |
| 1490 | |
| 1491 So we make a copy of the hentries at the beginning of the mapping | |
| 497 | 1492 operation, and iterate over the copy. Naturally, this is |
| 1493 expensive, but not as expensive as you might think, because no | |
| 1494 actual memory has to be collected by our notoriously inefficient | |
| 1495 GC; we use an unwind-protect instead to free the memory directly. | |
| 1496 | |
| 1497 We could avoid the copying by having the hash table modifiers | |
| 1498 puthash and remhash check for currently active mapping functions. | |
| 1499 Disadvantages: it's hard to get right, and IMO hash mapping | |
| 1500 functions are basically rare, and no extra space in the hash table | |
| 1501 object and no extra cpu in puthash or remhash should be wasted to | |
| 1502 make maphash 3% faster. From a design point of view, the basic | |
| 1503 functions gethash, puthash and remhash should be implementable | |
| 1504 without having to think about maphash. | |
| 1505 | |
| 1506 Note: We don't (yet) have Common Lisp's with-hash-table-iterator. | |
| 1507 If you implement this naively, you cannot have more than one | |
| 1508 concurrently active iterator over the same hash table. The `each' | |
| 1509 function in perl has this limitation. | |
| 1510 | |
| 1511 Note: We GCPRO memory on the heap, not on the stack. There is no | |
| 1512 obvious reason why this is bad, but as of this writing this is the | |
| 1513 only known occurrence of this technique in the code. | |
| 504 | 1514 |
| 1515 -- Martin | |
| 1516 */ | |
| 1517 | |
| 1518 /* Ben disagrees with the "copying hentries" design, and says: | |
| 1519 | |
| 1520 Another solution is the same as I've already proposed -- when | |
| 1521 mapping, mark the table as "change-unsafe", and in this case, use a | |
| 1522 secondary table to maintain changes. this could be basically a | |
| 1523 standard hash table, but with entries only for added or deleted | |
| 1524 entries in the primary table, and a marker like Qunbound to | |
| 1525 indicate a deleted entry. puthash, gethash and remhash need a | |
| 1526 single extra check for this secondary table -- totally | |
| 1527 insignificant speedwise. if you really cared about making | |
| 1528 recursive maphashes completely correct, you'd have to do a bit of | |
| 1529 extra work here -- when maphashing, if the secondary table exists, | |
| 1530 make a copy of it, and use the copy in conjunction with the primary | |
| 1531 table when mapping. the advantages of this are | |
| 1532 | |
| 1533 [a] easy to demonstrate correct, even with weak hashtables. | |
| 1534 | |
| 1535 [b] no extra overhead in the general maphash case -- only when you | |
| 1536 modify the table while maphashing, and even then the overhead is | |
| 1537 very small. | |
| 497 | 1538 */ |
| 1539 | |
| 489 | 1540 static Lisp_Object |
| 1541 maphash_unwind (Lisp_Object unwind_obj) | |
| 1542 { | |
| 1543 void *ptr = (void *) get_opaque_ptr (unwind_obj); | |
|
4976
16112448d484
Rename xfree(FOO, TYPE) -> xfree(FOO)
Ben Wing <ben@xemacs.org>
parents:
4962
diff
changeset
|
1544 xfree (ptr); |
| 489 | 1545 free_opaque_ptr (unwind_obj); |
| 1546 return Qnil; | |
| 1547 } | |
| 1548 | |
| 1549 /* Return a malloced array of alternating key/value pairs from HT. */ | |
| 1550 static Lisp_Object * | |
| 1551 copy_compress_hentries (const Lisp_Hash_Table *ht) | |
| 1552 { | |
| 1553 Lisp_Object * const objs = | |
| 1554 /* If the hash table is empty, ht->count could be 0. */ | |
| 1555 xnew_array (Lisp_Object, 2 * (ht->count > 0 ? ht->count : 1)); | |
| 1204 | 1556 const htentry *e, *sentinel; |
| 489 | 1557 Lisp_Object *pobj; |
| 1558 | |
| 1559 for (e = ht->hentries, sentinel = e + ht->size, pobj = objs; e < sentinel; e++) | |
| 1204 | 1560 if (!HTENTRY_CLEAR_P (e)) |
| 489 | 1561 { |
| 1562 *(pobj++) = e->key; | |
| 1563 *(pobj++) = e->value; | |
| 1564 } | |
| 1565 | |
| 1566 type_checking_assert (pobj == objs + 2 * ht->count); | |
| 1567 | |
| 1568 return objs; | |
| 1569 } | |
| 1570 | |
| 428 | 1571 DEFUN ("maphash", Fmaphash, 2, 2, 0, /* |
| 1572 Map FUNCTION over entries in HASH-TABLE, calling it with two args, | |
| 1573 each key and value in HASH-TABLE. | |
| 1574 | |
| 489 | 1575 FUNCTION must not modify HASH-TABLE, with the one exception that FUNCTION |
| 428 | 1576 may remhash or puthash the entry currently being processed by FUNCTION. |
| 1577 */ | |
| 1578 (function, hash_table)) | |
| 1579 { | |
| 489 | 1580 const Lisp_Hash_Table * const ht = xhash_table (hash_table); |
| 1581 Lisp_Object * const objs = copy_compress_hentries (ht); | |
| 1582 Lisp_Object args[3]; | |
| 1583 const Lisp_Object *pobj, *end; | |
| 1584 int speccount = specpdl_depth (); | |
| 1585 struct gcpro gcpro1; | |
| 1586 | |
| 1587 record_unwind_protect (maphash_unwind, make_opaque_ptr ((void *)objs)); | |
| 1588 GCPRO1 (objs[0]); | |
| 1589 gcpro1.nvars = 2 * ht->count; | |
| 428 | 1590 |
| 489 | 1591 args[0] = function; |
| 1592 | |
| 1593 for (pobj = objs, end = pobj + 2 * ht->count; pobj < end; pobj += 2) | |
| 1594 { | |
| 1595 args[1] = pobj[0]; | |
| 1596 args[2] = pobj[1]; | |
| 1597 Ffuncall (countof (args), args); | |
| 1598 } | |
| 1599 | |
| 771 | 1600 unbind_to (speccount); |
| 489 | 1601 UNGCPRO; |
| 428 | 1602 |
| 1603 return Qnil; | |
| 1604 } | |
| 1605 | |
| 489 | 1606 /* Map *C* function FUNCTION over the elements of a non-weak lisp hash table. |
| 1607 FUNCTION must not modify HASH-TABLE, with the one exception that FUNCTION | |
| 1608 may puthash the entry currently being processed by FUNCTION. | |
| 1609 Mapping terminates if FUNCTION returns something other than 0. */ | |
| 428 | 1610 void |
| 489 | 1611 elisp_maphash_unsafe (maphash_function_t function, |
| 428 | 1612 Lisp_Object hash_table, void *extra_arg) |
| 1613 { | |
| 442 | 1614 const Lisp_Hash_Table *ht = XHASH_TABLE (hash_table); |
| 1204 | 1615 const htentry *e, *sentinel; |
| 428 | 1616 |
| 1617 for (e = ht->hentries, sentinel = e + ht->size; e < sentinel; e++) | |
| 1204 | 1618 if (!HTENTRY_CLEAR_P (e)) |
| 489 | 1619 if (function (e->key, e->value, extra_arg)) |
| 1620 return; | |
| 428 | 1621 } |
| 1622 | |
| 489 | 1623 /* Map *C* function FUNCTION over the elements of a lisp hash table. |
| 1624 It is safe for FUNCTION to modify HASH-TABLE. | |
| 1625 Mapping terminates if FUNCTION returns something other than 0. */ | |
| 1626 void | |
| 1627 elisp_maphash (maphash_function_t function, | |
| 1628 Lisp_Object hash_table, void *extra_arg) | |
| 1629 { | |
| 1630 const Lisp_Hash_Table * const ht = xhash_table (hash_table); | |
| 1631 Lisp_Object * const objs = copy_compress_hentries (ht); | |
| 1632 const Lisp_Object *pobj, *end; | |
| 1633 int speccount = specpdl_depth (); | |
| 1634 struct gcpro gcpro1; | |
| 1635 | |
| 1636 record_unwind_protect (maphash_unwind, make_opaque_ptr ((void *)objs)); | |
| 1637 GCPRO1 (objs[0]); | |
| 1638 gcpro1.nvars = 2 * ht->count; | |
| 1639 | |
| 1640 for (pobj = objs, end = pobj + 2 * ht->count; pobj < end; pobj += 2) | |
| 1641 if (function (pobj[0], pobj[1], extra_arg)) | |
| 1642 break; | |
| 1643 | |
| 771 | 1644 unbind_to (speccount); |
| 489 | 1645 UNGCPRO; |
| 1646 } | |
| 1647 | |
| 1648 /* Remove all elements of a lisp hash table satisfying *C* predicate PREDICATE. | |
| 1649 PREDICATE must not modify HASH-TABLE. */ | |
| 428 | 1650 void |
| 1651 elisp_map_remhash (maphash_function_t predicate, | |
| 1652 Lisp_Object hash_table, void *extra_arg) | |
| 1653 { | |
| 489 | 1654 const Lisp_Hash_Table * const ht = xhash_table (hash_table); |
| 1655 Lisp_Object * const objs = copy_compress_hentries (ht); | |
| 1656 const Lisp_Object *pobj, *end; | |
| 1657 int speccount = specpdl_depth (); | |
| 1658 struct gcpro gcpro1; | |
| 428 | 1659 |
| 489 | 1660 record_unwind_protect (maphash_unwind, make_opaque_ptr ((void *)objs)); |
| 1661 GCPRO1 (objs[0]); | |
| 1662 gcpro1.nvars = 2 * ht->count; | |
| 1663 | |
| 1664 for (pobj = objs, end = pobj + 2 * ht->count; pobj < end; pobj += 2) | |
| 1665 if (predicate (pobj[0], pobj[1], extra_arg)) | |
| 1666 Fremhash (pobj[0], hash_table); | |
| 1667 | |
| 771 | 1668 unbind_to (speccount); |
| 489 | 1669 UNGCPRO; |
| 428 | 1670 } |
| 1671 | |
| 1672 | |
| 1673 /************************************************************************/ | |
| 1674 /* garbage collecting weak hash tables */ | |
| 1675 /************************************************************************/ | |
| 1598 | 1676 #ifdef USE_KKCC |
| 2645 | 1677 #define MARK_OBJ(obj) do { \ |
| 1678 Lisp_Object mo_obj = (obj); \ | |
| 1679 if (!marked_p (mo_obj)) \ | |
| 1680 { \ | |
|
5169
6c6d78781d59
cleanup of code related to xfree(), better KKCC backtrace capabilities, document XD_INLINE_LISP_OBJECT_BLOCK_PTR, fix some memory leaks, other code cleanup
Ben Wing <ben@xemacs.org>
parents:
5158
diff
changeset
|
1681 kkcc_gc_stack_push_lisp_object_0 (mo_obj); \ |
| 2645 | 1682 did_mark = 1; \ |
| 1683 } \ | |
| 1598 | 1684 } while (0) |
| 1685 | |
| 1686 #else /* NO USE_KKCC */ | |
| 1687 | |
| 442 | 1688 #define MARK_OBJ(obj) do { \ |
| 1689 Lisp_Object mo_obj = (obj); \ | |
| 1690 if (!marked_p (mo_obj)) \ | |
| 1691 { \ | |
| 1692 mark_object (mo_obj); \ | |
| 1693 did_mark = 1; \ | |
| 1694 } \ | |
| 1695 } while (0) | |
| 1598 | 1696 #endif /*NO USE_KKCC */ |
| 442 | 1697 |
| 428 | 1698 |
| 1699 /* Complete the marking for semi-weak hash tables. */ | |
| 1700 int | |
| 1701 finish_marking_weak_hash_tables (void) | |
| 1702 { | |
| 1703 Lisp_Object hash_table; | |
| 1704 int did_mark = 0; | |
| 1705 | |
| 1706 for (hash_table = Vall_weak_hash_tables; | |
| 1707 !NILP (hash_table); | |
| 1708 hash_table = XHASH_TABLE (hash_table)->next_weak) | |
| 1709 { | |
| 442 | 1710 const Lisp_Hash_Table *ht = XHASH_TABLE (hash_table); |
| 1204 | 1711 const htentry *e = ht->hentries; |
| 1712 const htentry *sentinel = e + ht->size; | |
| 428 | 1713 |
| 1714 if (! marked_p (hash_table)) | |
| 1715 /* The hash table is probably garbage. Ignore it. */ | |
| 1716 continue; | |
| 1717 | |
| 1718 /* Now, scan over all the pairs. For all pairs that are | |
| 1719 half-marked, we may need to mark the other half if we're | |
| 1720 keeping this pair. */ | |
| 1721 switch (ht->weakness) | |
| 1722 { | |
| 1723 case HASH_TABLE_KEY_WEAK: | |
| 1724 for (; e < sentinel; e++) | |
| 1204 | 1725 if (!HTENTRY_CLEAR_P (e)) |
| 428 | 1726 if (marked_p (e->key)) |
| 1727 MARK_OBJ (e->value); | |
| 1728 break; | |
| 1729 | |
| 1730 case HASH_TABLE_VALUE_WEAK: | |
| 1731 for (; e < sentinel; e++) | |
| 1204 | 1732 if (!HTENTRY_CLEAR_P (e)) |
| 428 | 1733 if (marked_p (e->value)) |
| 1734 MARK_OBJ (e->key); | |
| 1735 break; | |
| 1736 | |
| 442 | 1737 case HASH_TABLE_KEY_VALUE_WEAK: |
| 1738 for (; e < sentinel; e++) | |
| 1204 | 1739 if (!HTENTRY_CLEAR_P (e)) |
| 442 | 1740 { |
| 1741 if (marked_p (e->value)) | |
| 1742 MARK_OBJ (e->key); | |
| 1743 else if (marked_p (e->key)) | |
| 1744 MARK_OBJ (e->value); | |
| 1745 } | |
| 1746 break; | |
| 1747 | |
| 428 | 1748 case HASH_TABLE_KEY_CAR_WEAK: |
| 1749 for (; e < sentinel; e++) | |
| 1204 | 1750 if (!HTENTRY_CLEAR_P (e)) |
| 428 | 1751 if (!CONSP (e->key) || marked_p (XCAR (e->key))) |
| 1752 { | |
| 1753 MARK_OBJ (e->key); | |
| 1754 MARK_OBJ (e->value); | |
| 1755 } | |
| 1756 break; | |
| 1757 | |
| 450 | 1758 /* We seem to be sprouting new weakness types at an alarming |
| 1759 rate. At least this is not externally visible - and in | |
| 1760 fact all of these KEY_CAR_* types are only used by the | |
| 1761 glyph code. */ | |
| 1762 case HASH_TABLE_KEY_CAR_VALUE_WEAK: | |
| 1763 for (; e < sentinel; e++) | |
| 1204 | 1764 if (!HTENTRY_CLEAR_P (e)) |
| 450 | 1765 { |
| 1766 if (!CONSP (e->key) || marked_p (XCAR (e->key))) | |
| 1767 { | |
| 1768 MARK_OBJ (e->key); | |
| 1769 MARK_OBJ (e->value); | |
| 1770 } | |
| 1771 else if (marked_p (e->value)) | |
| 1772 MARK_OBJ (e->key); | |
| 1773 } | |
| 1774 break; | |
| 1775 | |
| 428 | 1776 case HASH_TABLE_VALUE_CAR_WEAK: |
| 1777 for (; e < sentinel; e++) | |
| 1204 | 1778 if (!HTENTRY_CLEAR_P (e)) |
| 428 | 1779 if (!CONSP (e->value) || marked_p (XCAR (e->value))) |
| 1780 { | |
| 1781 MARK_OBJ (e->key); | |
| 1782 MARK_OBJ (e->value); | |
| 1783 } | |
| 1784 break; | |
| 1785 | |
| 1786 default: | |
| 1787 break; | |
| 1788 } | |
| 1789 } | |
| 1790 | |
| 1791 return did_mark; | |
| 1792 } | |
| 1793 | |
| 1794 void | |
| 1795 prune_weak_hash_tables (void) | |
| 1796 { | |
| 1797 Lisp_Object hash_table, prev = Qnil; | |
| 1798 for (hash_table = Vall_weak_hash_tables; | |
| 1799 !NILP (hash_table); | |
| 1800 hash_table = XHASH_TABLE (hash_table)->next_weak) | |
| 1801 { | |
| 1802 if (! marked_p (hash_table)) | |
| 1803 { | |
| 1804 /* This hash table itself is garbage. Remove it from the list. */ | |
| 1805 if (NILP (prev)) | |
| 1806 Vall_weak_hash_tables = XHASH_TABLE (hash_table)->next_weak; | |
| 1807 else | |
| 1808 XHASH_TABLE (prev)->next_weak = XHASH_TABLE (hash_table)->next_weak; | |
| 1809 } | |
| 1810 else | |
| 1811 { | |
| 1812 /* Now, scan over all the pairs. Remove all of the pairs | |
| 1813 in which the key or value, or both, is unmarked | |
| 1814 (depending on the weakness of the hash table). */ | |
| 1815 Lisp_Hash_Table *ht = XHASH_TABLE (hash_table); | |
| 1204 | 1816 htentry *entries = ht->hentries; |
| 1817 htentry *sentinel = entries + ht->size; | |
| 1818 htentry *e; | |
| 428 | 1819 |
| 1820 for (e = entries; e < sentinel; e++) | |
| 1204 | 1821 if (!HTENTRY_CLEAR_P (e)) |
| 428 | 1822 { |
| 1823 again: | |
| 1824 if (!marked_p (e->key) || !marked_p (e->value)) | |
| 1825 { | |
| 1826 remhash_1 (ht, entries, e); | |
| 1204 | 1827 if (!HTENTRY_CLEAR_P (e)) |
| 428 | 1828 goto again; |
| 1829 } | |
| 1830 } | |
| 1831 | |
| 1832 prev = hash_table; | |
| 1833 } | |
| 1834 } | |
| 1835 } | |
| 1836 | |
| 1837 /* Return a hash value for an array of Lisp_Objects of size SIZE. */ | |
| 1838 | |
| 665 | 1839 Hashcode |
|
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1840 internal_array_hash (Lisp_Object *arr, int size, int depth, Boolint equalp) |
| 428 | 1841 { |
| 1842 int i; | |
| 665 | 1843 Hashcode hash = 0; |
| 442 | 1844 depth++; |
| 428 | 1845 |
| 1846 if (size <= 5) | |
| 1847 { | |
| 1848 for (i = 0; i < size; i++) | |
|
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1849 hash = HASH2 (hash, internal_hash (arr[i], depth, equalp)); |
| 428 | 1850 return hash; |
| 1851 } | |
| 1852 | |
| 1853 /* just pick five elements scattered throughout the array. | |
| 1854 A slightly better approach would be to offset by some | |
| 1855 noise factor from the points chosen below. */ | |
| 1856 for (i = 0; i < 5; i++) | |
|
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1857 hash = HASH2 (hash, internal_hash (arr[i*size/5], depth, equalp)); |
| 428 | 1858 |
| 1859 return hash; | |
| 1860 } | |
| 1861 | |
|
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1862 /* This needs to be algorithmically the same as |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1863 internal_array_hash(). Unfortunately, for strings with non-ASCII content, |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1864 it has to be O(2N), I don't see a reasonable alternative to hashing |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1865 sequence relying on their length. It is O(1) for pure ASCII strings, |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1866 though. */ |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1867 |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1868 static Hashcode |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1869 string_equalp_hash (Lisp_Object string) |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1870 { |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1871 Bytecount len = XSTRING_LENGTH (string), |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1872 ascii_begin = (Bytecount) XSTRING_ASCII_BEGIN (string); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1873 const Ibyte *ptr = XSTRING_DATA (string), *pend = ptr + len; |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1874 Charcount clen; |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1875 Hashcode hash = 0; |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1876 |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1877 if (len == ascii_begin) |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1878 { |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1879 clen = len; |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1880 } |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1881 else |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1882 { |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1883 clen = string_char_length (string); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1884 } |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1885 |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1886 if (clen <= 5) |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1887 { |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1888 while (ptr < pend) |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1889 { |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1890 hash = HASH2 (hash, |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1891 LISP_HASH (make_char (CANONCASE (NULL, |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1892 itext_ichar (ptr))))); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1893 INC_IBYTEPTR (ptr); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1894 } |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1895 } |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1896 else |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1897 { |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1898 int ii; |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1899 |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1900 if (clen == len) |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1901 { |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1902 for (ii = 0; ii < 5; ii++) |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1903 { |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1904 hash = HASH2 (hash, |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1905 LISP_HASH (make_char |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1906 (CANONCASE (NULL, |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1907 ptr[ii * clen / 5])))); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1908 } |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1909 } |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1910 else |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1911 { |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1912 Charcount this_char = 0, last_char = 0; |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1913 for (ii = 0; ii < 5; ii++) |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1914 { |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1915 this_char = ii * clen / 5; |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1916 ptr = itext_n_addr (ptr, this_char - last_char); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1917 last_char = this_char; |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1918 |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1919 hash = HASH2 (hash, |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1920 LISP_HASH (make_char |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1921 (CANONCASE (NULL, itext_ichar (ptr))))); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1922 } |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1923 } |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1924 } |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1925 |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1926 return HASH2 (clen, hash); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1927 } |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1928 |
| 428 | 1929 /* Return a hash value for a Lisp_Object. This is for use when hashing |
| 1930 objects with the comparison being `equal' (for `eq', you can just | |
| 1931 use the Lisp_Object itself as the hash value). You need to make a | |
| 1932 tradeoff between the speed of the hash function and how good the | |
| 1933 hashing is. In particular, the hash function needs to be FAST, | |
| 1934 so you can't just traipse down the whole tree hashing everything | |
| 1935 together. Most of the time, objects will differ in the first | |
| 1936 few elements you hash. Thus, we only go to a short depth (5) | |
| 1937 and only hash at most 5 elements out of a vector. Theoretically | |
| 1938 we could still take 5^5 time (a big big number) to compute a | |
| 1939 hash, but practically this won't ever happen. */ | |
| 1940 | |
| 665 | 1941 Hashcode |
|
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1942 internal_hash (Lisp_Object obj, int depth, Boolint equalp) |
| 428 | 1943 { |
| 1944 if (depth > 5) | |
| 1945 return 0; | |
|
4398
479443c0f95a
Have list hashes depend on the order of the contents, as is the case for vectors.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4117
diff
changeset
|
1946 |
|
5193
41ac827cb71b
fix cygwin compile, fix warning and style in elhash.c
Ben Wing <ben@xemacs.org>
parents:
5191
diff
changeset
|
1947 if (CONSP (obj)) |
| 428 | 1948 { |
|
4398
479443c0f95a
Have list hashes depend on the order of the contents, as is the case for vectors.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4117
diff
changeset
|
1949 Hashcode hash, h; |
|
479443c0f95a
Have list hashes depend on the order of the contents, as is the case for vectors.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4117
diff
changeset
|
1950 int s; |
|
479443c0f95a
Have list hashes depend on the order of the contents, as is the case for vectors.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4117
diff
changeset
|
1951 |
|
479443c0f95a
Have list hashes depend on the order of the contents, as is the case for vectors.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4117
diff
changeset
|
1952 depth += 1; |
|
479443c0f95a
Have list hashes depend on the order of the contents, as is the case for vectors.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4117
diff
changeset
|
1953 |
|
5193
41ac827cb71b
fix cygwin compile, fix warning and style in elhash.c
Ben Wing <ben@xemacs.org>
parents:
5191
diff
changeset
|
1954 if (!CONSP (XCDR (obj))) |
|
4398
479443c0f95a
Have list hashes depend on the order of the contents, as is the case for vectors.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4117
diff
changeset
|
1955 { |
|
479443c0f95a
Have list hashes depend on the order of the contents, as is the case for vectors.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4117
diff
changeset
|
1956 /* special case for '(a . b) conses */ |
|
5193
41ac827cb71b
fix cygwin compile, fix warning and style in elhash.c
Ben Wing <ben@xemacs.org>
parents:
5191
diff
changeset
|
1957 return HASH2 (internal_hash (XCAR(obj), depth, equalp), |
|
41ac827cb71b
fix cygwin compile, fix warning and style in elhash.c
Ben Wing <ben@xemacs.org>
parents:
5191
diff
changeset
|
1958 internal_hash (XCDR (obj), depth, equalp)); |
|
4398
479443c0f95a
Have list hashes depend on the order of the contents, as is the case for vectors.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4117
diff
changeset
|
1959 } |
|
479443c0f95a
Have list hashes depend on the order of the contents, as is the case for vectors.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4117
diff
changeset
|
1960 |
|
479443c0f95a
Have list hashes depend on the order of the contents, as is the case for vectors.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4117
diff
changeset
|
1961 /* Don't simply tail recurse; we want to hash lists with the |
|
479443c0f95a
Have list hashes depend on the order of the contents, as is the case for vectors.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4117
diff
changeset
|
1962 same contents in distinct orders differently. */ |
|
5193
41ac827cb71b
fix cygwin compile, fix warning and style in elhash.c
Ben Wing <ben@xemacs.org>
parents:
5191
diff
changeset
|
1963 hash = internal_hash (XCAR (obj), depth, equalp); |
|
4398
479443c0f95a
Have list hashes depend on the order of the contents, as is the case for vectors.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4117
diff
changeset
|
1964 |
|
5193
41ac827cb71b
fix cygwin compile, fix warning and style in elhash.c
Ben Wing <ben@xemacs.org>
parents:
5191
diff
changeset
|
1965 obj = XCDR (obj); |
|
41ac827cb71b
fix cygwin compile, fix warning and style in elhash.c
Ben Wing <ben@xemacs.org>
parents:
5191
diff
changeset
|
1966 for (s = 1; s < 6 && CONSP (obj); obj = XCDR (obj), s++) |
|
4398
479443c0f95a
Have list hashes depend on the order of the contents, as is the case for vectors.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4117
diff
changeset
|
1967 { |
|
5193
41ac827cb71b
fix cygwin compile, fix warning and style in elhash.c
Ben Wing <ben@xemacs.org>
parents:
5191
diff
changeset
|
1968 h = internal_hash (XCAR (obj), depth, equalp); |
|
41ac827cb71b
fix cygwin compile, fix warning and style in elhash.c
Ben Wing <ben@xemacs.org>
parents:
5191
diff
changeset
|
1969 hash = HASH3 (hash, h, s); |
|
4398
479443c0f95a
Have list hashes depend on the order of the contents, as is the case for vectors.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4117
diff
changeset
|
1970 } |
|
479443c0f95a
Have list hashes depend on the order of the contents, as is the case for vectors.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4117
diff
changeset
|
1971 |
|
479443c0f95a
Have list hashes depend on the order of the contents, as is the case for vectors.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4117
diff
changeset
|
1972 return hash; |
| 428 | 1973 } |
| 1974 if (STRINGP (obj)) | |
| 1975 { | |
|
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1976 if (equalp) |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1977 { |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1978 return string_equalp_hash (obj); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1979 } |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1980 |
| 428 | 1981 return hash_string (XSTRING_DATA (obj), XSTRING_LENGTH (obj)); |
| 1982 } | |
| 1983 if (LRECORDP (obj)) | |
| 1984 { | |
| 442 | 1985 const struct lrecord_implementation |
| 428 | 1986 *imp = XRECORD_LHEADER_IMPLEMENTATION (obj); |
| 1987 if (imp->hash) | |
|
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1988 return imp->hash (obj, depth, equalp); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1989 } |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1990 |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1991 if (equalp) |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1992 { |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1993 if (CHARP (obj)) |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1994 { |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1995 /* Characters and numbers of the same numeric value hash |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1996 differently, which is fine, they're not equalp. */ |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1997 return LISP_HASH (make_char (CANONCASE (NULL, XCHAR (obj)))); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1998 } |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
1999 |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2000 if (INTP (obj)) |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2001 { |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2002 return FLOAT_HASHCODE_FROM_DOUBLE ((double) (XINT (obj))); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2003 } |
| 428 | 2004 } |
| 2005 | |
| 2006 return LISP_HASH (obj); | |
| 2007 } | |
| 2008 | |
|
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2009 DEFUN ("eq-hash", Feq_hash, 1, 1, 0, /* |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2010 Return a hash value for OBJECT appropriate for use with `eq.' |
|
5520
05c1ad4f7a7b
Expand the documentation of #'eq-hash, mention the CL PRINT-OBJECT protocol
Aidan Kehoe <kehoea@parhasard.net>
parents:
5474
diff
changeset
|
2011 |
|
05c1ad4f7a7b
Expand the documentation of #'eq-hash, mention the CL PRINT-OBJECT protocol
Aidan Kehoe <kehoea@parhasard.net>
parents:
5474
diff
changeset
|
2012 If OBJECT is not immediate (it is not a fixnum or character) this hash value |
|
05c1ad4f7a7b
Expand the documentation of #'eq-hash, mention the CL PRINT-OBJECT protocol
Aidan Kehoe <kehoea@parhasard.net>
parents:
5474
diff
changeset
|
2013 will be unique among currently-reachable objects, and is appropriate for |
|
05c1ad4f7a7b
Expand the documentation of #'eq-hash, mention the CL PRINT-OBJECT protocol
Aidan Kehoe <kehoea@parhasard.net>
parents:
5474
diff
changeset
|
2014 implementing the Common Lisp PRINT-OBJECT protocol. |
|
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2015 */ |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2016 (object)) |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2017 { |
|
5193
41ac827cb71b
fix cygwin compile, fix warning and style in elhash.c
Ben Wing <ben@xemacs.org>
parents:
5191
diff
changeset
|
2018 return make_integer ((EMACS_INT) XPNTRVAL (object)); |
|
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2019 } |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2020 |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2021 DEFUN ("eql-hash", Feql_hash, 1, 1, 0, /* |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2022 Return a hash value for OBJECT appropriate for use with `eql.' |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2023 */ |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2024 (object)) |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2025 { |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2026 EMACS_INT hashed = lisp_object_eql_hash (NULL, object); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2027 return make_integer (hashed); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2028 } |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2029 |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2030 DEFUN ("equal-hash", Fequal_hash, 1, 1, 0, /* |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2031 Return a hash value for OBJECT appropriate for use with `equal.' |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2032 \(equal obj1 obj2) implies (= (equal-hash obj1) (equal-hash obj2)). |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2033 */ |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2034 (object)) |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2035 { |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2036 EMACS_INT hashed = internal_hash (object, 0, 0); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2037 return make_integer (hashed); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2038 } |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2039 |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2040 DEFUN ("equalp-hash", Fequalp_hash, 1, 1, 0, /* |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2041 Return a hash value for OBJECT appropriate for use with `equalp.' |
| 428 | 2042 */ |
| 2043 (object)) | |
| 2044 { | |
|
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2045 EMACS_INT hashed = internal_hash (object, 0, 1); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2046 return make_integer (hashed); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2047 } |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2048 |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2049 static Lisp_Object |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2050 make_hash_table_test (Lisp_Object name, |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2051 hash_table_equal_function_t equal_function, |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2052 hash_table_hash_function_t hash_function, |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2053 Lisp_Object lisp_equal_function, |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2054 Lisp_Object lisp_hash_function) |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2055 { |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2056 Lisp_Object result = ALLOC_NORMAL_LISP_OBJECT (hash_table_test); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2057 Hash_Table_Test *http = XHASH_TABLE_TEST (result); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2058 |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2059 http->name = name; |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2060 http->equal_function = equal_function; |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2061 http->hash_function = hash_function; |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2062 http->lisp_equal_function = lisp_equal_function; |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2063 http->lisp_hash_function = lisp_hash_function; |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2064 |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2065 return result; |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2066 } |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2067 |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2068 Lisp_Object |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2069 define_hash_table_test (Lisp_Object name, |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2070 hash_table_equal_function_t equal_function, |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2071 hash_table_hash_function_t hash_function, |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2072 Lisp_Object lisp_equal_function, |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2073 Lisp_Object lisp_hash_function) |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2074 { |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2075 Lisp_Object result = make_hash_table_test (name, equal_function, |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2076 hash_function, |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2077 lisp_equal_function, |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2078 lisp_hash_function); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2079 XWEAK_LIST_LIST (Vhash_table_test_weak_list) |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2080 = Fcons (Fcons (name, result), |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2081 XWEAK_LIST_LIST (Vhash_table_test_weak_list)); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2082 |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2083 return result; |
| 428 | 2084 } |
| 2085 | |
|
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2086 DEFUN ("define-hash-table-test", Fdefine_hash_table_test, 3, 3, 0, /* |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2087 Define a new hash table test with name NAME, a symbol. |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2088 |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2089 In a hash table created with NAME as its test, use EQUAL-FUNCTION to compare |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2090 keys, and HASH-FUNCTION for computing hash codes of keys. |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2091 |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2092 EQUAL-FUNCTION must be a function taking two arguments and returning non-nil |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2093 if both arguments are the same. HASH-FUNCTION must be a function taking one |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2094 argument and returning an integer that is the hash code of the argument. |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2095 |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2096 Computation should use the whole value range of the underlying machine long |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2097 type. In XEmacs this will necessitate bignums for values above |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2098 `most-positive-fixnum' but below (1+ (* most-positive-fixnum 2)) and |
|
5384
3889ef128488
Fix misspelled words, and some grammar, across the entire source tree.
Jerry James <james@xemacs.org>
parents:
5320
diff
changeset
|
2099 analogous values below `most-negative-fixnum'. Relatively poor hashing |
|
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2100 performance is guaranteed in a build without bignums. |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2101 |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2102 This function returns t if successful, and errors if NAME |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2103 cannot be defined as a hash table test. |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2104 */ |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2105 (name, equal_function, hash_function)) |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2106 { |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2107 Lisp_Object min, max, lookup; |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2108 |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2109 CHECK_SYMBOL (name); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2110 |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2111 lookup = Fassq (name, XWEAK_LIST_LIST (Vhash_table_test_weak_list)); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2112 |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2113 if (!NILP (lookup)) |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2114 { |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2115 invalid_change ("Cannot redefine existing hash table test", name); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2116 } |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2117 |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2118 min = Ffunction_min_args (equal_function); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2119 max = Ffunction_max_args (equal_function); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2120 |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2121 if (!((XINT (min) <= 2) && (NILP (max) || 2 <= XINT (max)))) |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2122 { |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2123 signal_wrong_number_of_arguments_error (equal_function, 2); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2124 } |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2125 |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2126 min = Ffunction_min_args (hash_function); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2127 max = Ffunction_max_args (hash_function); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2128 |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2129 if (!((XINT (min) <= 1) && (NILP (max) || 1 <= XINT (max)))) |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2130 { |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2131 signal_wrong_number_of_arguments_error (hash_function, 1); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2132 } |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2133 |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2134 define_hash_table_test (name, lisp_object_general_equal, |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2135 lisp_object_general_hash, equal_function, |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2136 hash_function); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2137 return Qt; |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2138 } |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2139 |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2140 DEFUN ("valid-hash-table-test-p", Fvalid_hash_table_test_p, 1, 1, 0, /* |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2141 Return t if OBJECT names a hash table test, nil otherwise. |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2142 |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2143 A valid hash table test is one of the symbols `eq', `eql', `equal', |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2144 `equalp', or some symbol passed as the NAME argument to |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2145 `define-hash-table-test'. As a special case, `nil' is regarded as |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2146 equivalent to `eql'. |
| 428 | 2147 */ |
| 2148 (object)) | |
| 2149 { | |
|
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2150 Lisp_Object lookup; |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2151 |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2152 if (NILP (object)) |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2153 { |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2154 return Qt; |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2155 } |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2156 |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2157 lookup = Fassq (object, XWEAK_LIST_LIST (Vhash_table_test_weak_list)); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2158 |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2159 if (!NILP (lookup)) |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2160 { |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2161 return Qt; |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2162 } |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2163 |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2164 return Qnil; |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2165 } |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2166 |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2167 DEFUN ("hash-table-test-list", Fhash_table_test_list, 0, 0, 0, /* |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2168 Return a list of symbols naming valid hash table tests. |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2169 These can be passed as the value of the TEST keyword to `make-hash-table'. |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2170 This list does not include nil, regarded as equivalent to `eql' by |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2171 `make-hash-table'. |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2172 */ |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2173 ()) |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2174 { |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2175 Lisp_Object result = Qnil; |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2176 |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2177 LIST_LOOP_2 (test, XWEAK_LIST_LIST (Vhash_table_test_weak_list)) |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2178 { |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2179 if (!UNBOUNDP (XCAR (test))) |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2180 { |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2181 result = Fcons (XCAR (test), result); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2182 } |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2183 } |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2184 |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2185 return result; |
| 428 | 2186 } |
|
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2187 |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2188 DEFUN ("hash-table-test-equal-function", |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2189 Fhash_table_test_equal_function, 1, 1, 0, /* |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2190 Return the comparison function used for hash table test TEST. |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2191 See `define-hash-table-test' and `make-hash-table'. |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2192 */ |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2193 (test)) |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2194 { |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2195 Lisp_Object lookup; |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2196 |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2197 if (NILP (test)) |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2198 { |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2199 test = Qeql; |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2200 } |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2201 |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2202 lookup = Fassq (test, XWEAK_LIST_LIST (Vhash_table_test_weak_list)); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2203 if (NILP (lookup)) |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2204 { |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2205 invalid_argument ("Not a defined hash table test", test); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2206 } |
| 428 | 2207 |
|
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2208 return XHASH_TABLE_TEST (XCDR (lookup))->lisp_equal_function; |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2209 } |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2210 |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2211 DEFUN ("hash-table-test-hash-function", |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2212 Fhash_table_test_hash_function, 1, 1, 0, /* |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2213 Return the hash function used for hash table test TEST. |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2214 See `define-hash-table-test' and `make-hash-table'. |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2215 */ |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2216 (test)) |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2217 { |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2218 Lisp_Object lookup; |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2219 |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2220 if (NILP (test)) |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2221 { |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2222 test = Qeql; |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2223 } |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2224 |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2225 lookup = Fassq (test, XWEAK_LIST_LIST (Vhash_table_test_weak_list)); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2226 if (NILP (lookup)) |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2227 { |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2228 invalid_argument ("Not a defined hash table test", test); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2229 } |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2230 |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2231 return XHASH_TABLE_TEST (XCDR (lookup))->lisp_hash_function; |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2232 } |
| 428 | 2233 |
| 2234 /************************************************************************/ | |
| 2235 /* initialization */ | |
| 2236 /************************************************************************/ | |
| 2237 | |
| 2238 void | |
|
5158
9e0b43d3095c
more cleanups to object-memory-usage stuff
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
2239 hash_table_objects_create (void) |
|
9e0b43d3095c
more cleanups to object-memory-usage stuff
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
2240 { |
|
9e0b43d3095c
more cleanups to object-memory-usage stuff
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
2241 #ifdef MEMORY_USAGE_STATS |
|
9e0b43d3095c
more cleanups to object-memory-usage stuff
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
2242 OBJECT_HAS_METHOD (hash_table, memory_usage); |
|
9e0b43d3095c
more cleanups to object-memory-usage stuff
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
2243 #endif |
|
9e0b43d3095c
more cleanups to object-memory-usage stuff
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
2244 } |
|
9e0b43d3095c
more cleanups to object-memory-usage stuff
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
2245 |
|
9e0b43d3095c
more cleanups to object-memory-usage stuff
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
2246 void |
| 428 | 2247 syms_of_elhash (void) |
| 2248 { | |
| 2249 DEFSUBR (Fhash_table_p); | |
| 2250 DEFSUBR (Fmake_hash_table); | |
| 2251 DEFSUBR (Fcopy_hash_table); | |
| 2252 DEFSUBR (Fgethash); | |
| 2253 DEFSUBR (Fremhash); | |
| 2254 DEFSUBR (Fputhash); | |
| 2255 DEFSUBR (Fclrhash); | |
| 2256 DEFSUBR (Fmaphash); | |
| 2257 DEFSUBR (Fhash_table_count); | |
| 2258 DEFSUBR (Fhash_table_test); | |
| 2259 DEFSUBR (Fhash_table_size); | |
| 2260 DEFSUBR (Fhash_table_rehash_size); | |
| 2261 DEFSUBR (Fhash_table_rehash_threshold); | |
| 2262 DEFSUBR (Fhash_table_weakness); | |
| 2263 DEFSUBR (Fhash_table_type); /* obsolete */ | |
|
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2264 |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2265 DEFSUBR (Feq_hash); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2266 DEFSUBR (Feql_hash); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2267 DEFSUBR (Fequal_hash); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2268 Ffset (intern ("sxhash"), intern ("equal-hash")); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2269 DEFSUBR (Fequalp_hash); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2270 |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2271 DEFSUBR (Fdefine_hash_table_test); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2272 DEFSUBR (Fvalid_hash_table_test_p); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2273 DEFSUBR (Fhash_table_test_list); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2274 DEFSUBR (Fhash_table_test_equal_function); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2275 DEFSUBR (Fhash_table_test_hash_function); |
| 428 | 2276 |
| 563 | 2277 DEFSYMBOL_MULTIWORD_PREDICATE (Qhash_tablep); |
|
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2278 |
| 563 | 2279 DEFSYMBOL (Qhash_table); |
| 2280 DEFSYMBOL (Qhashtable); | |
|
5084
6afe991b8135
Add a PARSE_KEYWORDS macro, use it in #'make-hash-table.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4976
diff
changeset
|
2281 DEFSYMBOL (Qmake_hash_table); |
| 563 | 2282 DEFSYMBOL (Qweakness); |
| 2283 DEFSYMBOL (Qvalue); | |
| 2284 DEFSYMBOL (Qkey_or_value); | |
| 2285 DEFSYMBOL (Qkey_and_value); | |
| 2286 DEFSYMBOL (Qrehash_size); | |
| 2287 DEFSYMBOL (Qrehash_threshold); | |
| 428 | 2288 |
| 563 | 2289 DEFSYMBOL (Qweak); /* obsolete */ |
| 2290 DEFSYMBOL (Qkey_weak); /* obsolete */ | |
| 2291 DEFSYMBOL (Qkey_or_value_weak); /* obsolete */ | |
| 2292 DEFSYMBOL (Qvalue_weak); /* obsolete */ | |
| 2293 DEFSYMBOL (Qnon_weak); /* obsolete */ | |
| 428 | 2294 |
|
4820
e6dec75ded0e
Use keywords, not ordinary symbols, in the structure syntax for hash tables.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4779
diff
changeset
|
2295 DEFKEYWORD (Q_data); |
| 563 | 2296 DEFKEYWORD (Q_size); |
| 2297 DEFKEYWORD (Q_rehash_size); | |
| 2298 DEFKEYWORD (Q_rehash_threshold); | |
| 2299 DEFKEYWORD (Q_weakness); | |
| 428 | 2300 } |
| 2301 | |
| 2302 void | |
|
5158
9e0b43d3095c
more cleanups to object-memory-usage stuff
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
2303 vars_of_elhash (void) |
|
9e0b43d3095c
more cleanups to object-memory-usage stuff
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
2304 { |
|
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2305 Lisp_Object weak_list_list = XWEAK_LIST_LIST (Vhash_table_test_weak_list); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2306 |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2307 /* This var was staticpro'd and initialised in |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2308 init_elhash_once_early, but its Vall_weak_lists isn't sane, since |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2309 that was done before vars_of_data() was called. Create a sane |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2310 weak list object now, set its list appropriately, assert that our |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2311 data haven't been garbage collected. */ |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2312 assert (!NILP (Fassq (Qeq, weak_list_list))); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2313 assert (!NILP (Fassq (Qeql, weak_list_list))); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2314 assert (!NILP (Fassq (Qequal, weak_list_list))); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2315 assert (!NILP (Fassq (Qequalp, weak_list_list))); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2316 assert (4 == XINT (Flength (weak_list_list))); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2317 |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2318 Vhash_table_test_weak_list = make_weak_list (WEAK_LIST_KEY_ASSOC); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2319 XWEAK_LIST_LIST (Vhash_table_test_weak_list) = weak_list_list; |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2320 |
|
5158
9e0b43d3095c
more cleanups to object-memory-usage stuff
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
2321 #ifdef MEMORY_USAGE_STATS |
|
9e0b43d3095c
more cleanups to object-memory-usage stuff
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
2322 OBJECT_HAS_PROPERTY |
|
9e0b43d3095c
more cleanups to object-memory-usage stuff
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
2323 (hash_table, memusage_stats_list, list1 (intern ("hash-entries"))); |
|
9e0b43d3095c
more cleanups to object-memory-usage stuff
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
2324 #endif /* MEMORY_USAGE_STATS */ |
|
9e0b43d3095c
more cleanups to object-memory-usage stuff
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
2325 } |
|
9e0b43d3095c
more cleanups to object-memory-usage stuff
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
2326 |
|
9e0b43d3095c
more cleanups to object-memory-usage stuff
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
2327 void |
| 771 | 2328 init_elhash_once_early (void) |
| 428 | 2329 { |
|
5117
3742ea8250b5
Checking in final CVS version of workspace 'ben-lisp-object'
Ben Wing <ben@xemacs.org>
parents:
3017
diff
changeset
|
2330 INIT_LISP_OBJECT (hash_table); |
|
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2331 INIT_LISP_OBJECT (hash_table_test); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2332 |
| 3092 | 2333 #ifdef NEW_GC |
|
5118
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
2334 INIT_LISP_OBJECT (hash_table_entry); |
| 3092 | 2335 #endif /* NEW_GC */ |
| 771 | 2336 |
|
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2337 /* init_elhash_once_early() is called very early, we can't have these |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2338 DEFSYMBOLs in syms_of_elhash(), unfortunately. */ |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2339 |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2340 DEFSYMBOL (Qeq); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2341 DEFSYMBOL (Qeql); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2342 DEFSYMBOL (Qequal); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2343 DEFSYMBOL (Qequalp); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2344 |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2345 DEFSYMBOL (Qeq_hash); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2346 DEFSYMBOL (Qeql_hash); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2347 DEFSYMBOL (Qequal_hash); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2348 DEFSYMBOL (Qequalp_hash); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2349 |
| 428 | 2350 /* This must NOT be staticpro'd */ |
| 2351 Vall_weak_hash_tables = Qnil; | |
| 452 | 2352 dump_add_weak_object_chain (&Vall_weak_hash_tables); |
|
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2353 |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2354 staticpro (&Vhash_table_test_weak_list); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2355 Vhash_table_test_weak_list = make_weak_list (WEAK_LIST_KEY_ASSOC); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2356 |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2357 staticpro (&Vhash_table_test_eq); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2358 Vhash_table_test_eq = define_hash_table_test (Qeq, NULL, NULL, Qeq, Qeq_hash); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2359 staticpro (&Vhash_table_test_eql); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2360 Vhash_table_test_eql |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2361 = define_hash_table_test (Qeql, lisp_object_eql_equal, |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2362 lisp_object_eql_hash, Qeql, Qeql_hash); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2363 (void) define_hash_table_test (Qequal, lisp_object_equal_equal, |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2364 lisp_object_equal_hash, Qequal, Qequal_hash); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2365 (void) define_hash_table_test (Qequalp, lisp_object_equalp_equal, |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
2366 lisp_object_equalp_hash, Qequalp, Qequalp_hash); |
| 428 | 2367 } |