Mercurial > hg > xemacs-beta
comparison src/chartab.c @ 5191:71ee43b8a74d
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 | a9c41067dd88 |
| children | 18c0b5909d16 |
comparison
equal
deleted
inserted
replaced
| 5190:1c1d8843de5e | 5191:71ee43b8a74d |
|---|---|
| 126 | 126 |
| 127 return 1; | 127 return 1; |
| 128 } | 128 } |
| 129 | 129 |
| 130 static Hashcode | 130 static Hashcode |
| 131 char_table_entry_hash (Lisp_Object obj, int depth) | 131 char_table_entry_hash (Lisp_Object obj, int depth, Boolint equalp) |
| 132 { | 132 { |
| 133 Lisp_Char_Table_Entry *cte = XCHAR_TABLE_ENTRY (obj); | 133 Lisp_Char_Table_Entry *cte = XCHAR_TABLE_ENTRY (obj); |
| 134 | 134 |
| 135 return internal_array_hash (cte->level2, 96, depth + 1); | 135 return internal_array_hash (cte->level2, 96, depth + 1, equalp); |
| 136 } | 136 } |
| 137 | 137 |
| 138 static const struct memory_description char_table_entry_description[] = { | 138 static const struct memory_description char_table_entry_description[] = { |
| 139 { XD_LISP_OBJECT_ARRAY, offsetof (Lisp_Char_Table_Entry, level2), 96 }, | 139 { XD_LISP_OBJECT_ARRAY, offsetof (Lisp_Char_Table_Entry, level2), 96 }, |
| 140 { XD_END } | 140 { XD_END } |
| 367 | 367 |
| 368 return internal_equal_0 (ct1->default_, ct2->default_, depth + 1, foldcase); | 368 return internal_equal_0 (ct1->default_, ct2->default_, depth + 1, foldcase); |
| 369 } | 369 } |
| 370 | 370 |
| 371 static Hashcode | 371 static Hashcode |
| 372 char_table_hash (Lisp_Object obj, int depth) | 372 char_table_hash (Lisp_Object obj, int depth, Boolint equalp) |
| 373 { | 373 { |
| 374 Lisp_Char_Table *ct = XCHAR_TABLE (obj); | 374 Lisp_Char_Table *ct = XCHAR_TABLE (obj); |
| 375 Hashcode hashval = internal_array_hash (ct->ascii, NUM_ASCII_CHARS, | 375 Hashcode hashval = internal_array_hash (ct->ascii, NUM_ASCII_CHARS, |
| 376 depth + 1); | 376 depth + 1, equalp); |
| 377 #ifdef MULE | 377 #ifdef MULE |
| 378 hashval = HASH2 (hashval, | 378 hashval = HASH2 (hashval, |
| 379 internal_array_hash (ct->level1, NUM_LEADING_BYTES, | 379 internal_array_hash (ct->level1, NUM_LEADING_BYTES, |
| 380 depth + 1)); | 380 depth + 1, equalp)); |
| 381 #endif /* MULE */ | 381 #endif /* MULE */ |
| 382 return HASH2 (hashval, internal_hash (ct->default_, depth + 1)); | 382 return HASH2 (hashval, internal_hash (ct->default_, depth + 1, equalp)); |
| 383 } | 383 } |
| 384 | 384 |
| 385 static const struct memory_description char_table_description[] = { | 385 static const struct memory_description char_table_description[] = { |
| 386 { XD_LISP_OBJECT_ARRAY, offsetof (Lisp_Char_Table, ascii), NUM_ASCII_CHARS }, | 386 { XD_LISP_OBJECT_ARRAY, offsetof (Lisp_Char_Table, ascii), NUM_ASCII_CHARS }, |
| 387 #ifdef MULE | 387 #ifdef MULE |