Mercurial > hg > xemacs-beta

comparison src/rangetab.c @ 5191:71ee43b8a74d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API tests/ChangeLog addition: 2010-04-05 Aidan Kehoe <kehoea@parhasard.net> * automated/hash-table-tests.el: Test the new built-in #'equalp hash table test. Test #'define-hash-table-test. * automated/lisp-tests.el: When asserting that two objects are #'equalp, also assert that their #'equalp-hash is identical. man/ChangeLog addition: 2010-04-03 Aidan Kehoe <kehoea@parhasard.net> * lispref/hash-tables.texi (Introduction to Hash Tables): Document that we now support #'equalp as a hash table test by default, and mention #'define-hash-table-test. (Working With Hash Tables): Document #'define-hash-table-test. src/ChangeLog addition: 2010-04-05 Aidan Kehoe <kehoea@parhasard.net> * elhash.h: * elhash.c (struct Hash_Table_Test, lisp_object_eql_equal) (lisp_object_eql_hash, lisp_object_equal_equal) (lisp_object_equal_hash, lisp_object_equalp_hash) (lisp_object_equalp_equal, lisp_object_general_hash) (lisp_object_general_equal, Feq_hash, Feql_hash, Fequal_hash) (Fequalp_hash, define_hash_table_test, Fdefine_hash_table_test) (init_elhash_once_early, mark_hash_table_tests, string_equalp_hash): * glyphs.c (vars_of_glyphs): Add a new hash table test in C, #'equalp. Make it possible to specify new hash table tests with functions define_hash_table_test, #'define-hash-table-test. Use define_hash_table_test() in glyphs.c. Expose the hash functions (besides that used for #'equal) to Lisp, for people writing functions to be used with #'define-hash-table-test. Call define_hash_table_test() very early in temacs, to create the built-in hash table tests. * ui-gtk.c (emacs_gtk_boxed_hash): * specifier.h (struct specifier_methods): * specifier.c (specifier_hash): * rangetab.c (range_table_entry_hash, range_table_hash): * number.c (bignum_hash, ratio_hash, bigfloat_hash): * marker.c (marker_hash): * lrecord.h (struct lrecord_implementation): * keymap.c (keymap_hash): * gui.c (gui_item_id_hash, gui_item_hash): * glyphs.c (image_instance_hash, glyph_hash): * glyphs-x.c (x_image_instance_hash): * glyphs-msw.c (mswindows_image_instance_hash): * glyphs-gtk.c (gtk_image_instance_hash): * frame-msw.c (mswindows_set_title_from_ibyte): * fontcolor.c (color_instance_hash, font_instance_hash): * fontcolor-x.c (x_color_instance_hash): * fontcolor-tty.c (tty_color_instance_hash): * fontcolor-msw.c (mswindows_color_instance_hash): * fontcolor-gtk.c (gtk_color_instance_hash): * fns.c (bit_vector_hash): * floatfns.c (float_hash): * faces.c (face_hash): * extents.c (extent_hash): * events.c (event_hash): * data.c (weak_list_hash, weak_box_hash): * chartab.c (char_table_entry_hash, char_table_hash): * bytecode.c (compiled_function_hash): * alloc.c (vector_hash): Change the various object hash methods to take a new EQUALP parameter, hashing appropriately for #'equalp if it is true.
author Aidan Kehoe <kehoea@parhasard.net>
date Mon, 05 Apr 2010 13:03:35 +0100
parents 6c6d78781d59
children 18c0b5909d16
comparison
equal deleted inserted replaced
5190:1c1d8843de5e 5191:71ee43b8a74d
161 161
162 return 1; 162 return 1;
163 } 163 }
164 164
165 static Hashcode 165 static Hashcode
166 range_table_entry_hash (struct range_table_entry *rte, int depth) 166 range_table_entry_hash (struct range_table_entry *rte, int depth,
167 { 167 Boolint equalp)
168 return HASH3 (rte->first, rte->last, internal_hash (rte->val, depth + 1)); 168 {
169 return HASH3 (rte->first, rte->last,
170 internal_hash (rte->val, depth + 1, equalp));
169 } 171 }
170 172
171 static Hashcode 173 static Hashcode
172 range_table_hash (Lisp_Object obj, int depth) 174 range_table_hash (Lisp_Object obj, int depth, Boolint equalp)
173 { 175 {
174 Lisp_Range_Table *rt = XRANGE_TABLE (obj); 176 Lisp_Range_Table *rt = XRANGE_TABLE (obj);
175 int i; 177 int i;
176 int size = gap_array_length (rt->entries); 178 int size = gap_array_length (rt->entries);
177 Hashcode hash = size; 179 Hashcode hash = size;
180 if (size <= 5) 182 if (size <= 5)
181 { 183 {
182 for (i = 0; i < size; i++) 184 for (i = 0; i < size; i++)
183 hash = HASH2 (hash, 185 hash = HASH2 (hash,
184 range_table_entry_hash 186 range_table_entry_hash
185 (rangetab_gap_array_atp (rt->entries, i), depth)); 187 (rangetab_gap_array_atp (rt->entries, i), depth, equalp));
186 return hash; 188 return hash;
187 } 189 }
188 190
189 /* just pick five elements scattered throughout the array. 191 /* just pick five elements scattered throughout the array.
190 A slightly better approach would be to offset by some 192 A slightly better approach would be to offset by some
191 noise factor from the points chosen below. */ 193 noise factor from the points chosen below. */
192 for (i = 0; i < 5; i++) 194 for (i = 0; i < 5; i++)
193 hash = HASH2 (hash, 195 hash = HASH2 (hash,
194 range_table_entry_hash 196 range_table_entry_hash
195 (rangetab_gap_array_atp (rt->entries, i*size/5), depth)); 197 (rangetab_gap_array_atp (rt->entries, i*size/5),
198 depth, equalp));
196 return hash; 199 return hash;
197 } 200 }
198 201
199 #ifndef NEW_GC 202 #ifndef NEW_GC
200 203