Mercurial > hg > xemacs-beta
comparison src/keymap.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 | f283b08ff0c9 |
| children | 94bbd4792049 308d34e9f07d |
comparison
equal
deleted
inserted
replaced
| 5190:1c1d8843de5e | 5191:71ee43b8a74d |
|---|---|
| 251 1 | 251 1 |
| 252 ); | 252 ); |
| 253 } | 253 } |
| 254 | 254 |
| 255 static Hashcode | 255 static Hashcode |
| 256 keymap_hash (Lisp_Object obj, int depth) | 256 keymap_hash (Lisp_Object obj, int depth, Boolint UNUSED (equalp)) |
| 257 { | 257 { |
| 258 Lisp_Keymap *k = XKEYMAP (obj); | 258 Lisp_Keymap *k = XKEYMAP (obj); |
| 259 Hashcode hash = 0xCAFEBABE; /* why not? */ | 259 Hashcode hash = 0xCAFEBABE; /* why not? */ |
| 260 | 260 |
| 261 depth++; | 261 depth++; |
| 262 | 262 |
| 263 #define MARKED_SLOT(x) \ | 263 #define MARKED_SLOT(x) \ |
| 264 hash = HASH2 (hash, internal_hash (k->x, depth)); | 264 hash = HASH2 (hash, internal_hash (k->x, depth, 0)); |
| 265 #define MARKED_SLOT_NOCOMPARE(x) | 265 #define MARKED_SLOT_NOCOMPARE(x) |
| 266 #include "keymap-slots.h" | 266 #include "keymap-slots.h" |
| 267 | 267 |
| 268 return hash; | 268 return hash; |
| 269 } | 269 } |
| 785 #include "keymap-slots.h" | 785 #include "keymap-slots.h" |
| 786 | 786 |
| 787 if (size != 0) /* hack for copy-keymap */ | 787 if (size != 0) /* hack for copy-keymap */ |
| 788 { | 788 { |
| 789 keymap->table = | 789 keymap->table = |
| 790 make_lisp_hash_table (size, HASH_TABLE_NON_WEAK, HASH_TABLE_EQ); | 790 make_lisp_hash_table (size, HASH_TABLE_NON_WEAK, Qeq); |
| 791 /* Inverse table is often less dense because of duplicate key-bindings. | 791 /* Inverse table is often less dense because of duplicate key-bindings. |
| 792 If not, it will grow anyway. */ | 792 If not, it will grow anyway. */ |
| 793 keymap->inverse_table = | 793 keymap->inverse_table = |
| 794 make_lisp_hash_table (size * 3 / 4, HASH_TABLE_NON_WEAK, | 794 make_lisp_hash_table (size * 3 / 4, HASH_TABLE_NON_WEAK, |
| 795 HASH_TABLE_EQ); | 795 Qeq); |
| 796 } | 796 } |
| 797 return obj; | 797 return obj; |
| 798 } | 798 } |
| 799 | 799 |
| 800 DEFUN ("make-keymap", Fmake_keymap, 0, 1, 0, /* | 800 DEFUN ("make-keymap", Fmake_keymap, 0, 1, 0, /* |