Mercurial > hg > xemacs-beta
comparison src/data.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 | 6c6d78781d59 |
| children | 1096ef427b56 |
comparison
equal
deleted
inserted
replaced
| 5190:1c1d8843de5e | 5191:71ee43b8a74d |
|---|---|
| 2631 return ((w1->type == w2->type) && | 2631 return ((w1->type == w2->type) && |
| 2632 internal_equal_0 (w1->list, w2->list, depth + 1, foldcase)); | 2632 internal_equal_0 (w1->list, w2->list, depth + 1, foldcase)); |
| 2633 } | 2633 } |
| 2634 | 2634 |
| 2635 static Hashcode | 2635 static Hashcode |
| 2636 weak_list_hash (Lisp_Object obj, int depth) | 2636 weak_list_hash (Lisp_Object obj, int depth, Boolint equalp) |
| 2637 { | 2637 { |
| 2638 struct weak_list *w = XWEAK_LIST (obj); | 2638 struct weak_list *w = XWEAK_LIST (obj); |
| 2639 | 2639 |
| 2640 return HASH2 ((Hashcode) w->type, | 2640 return HASH2 ((Hashcode) w->type, |
| 2641 internal_hash (w->list, depth + 1)); | 2641 internal_hash (w->list, depth + 1, equalp)); |
| 2642 } | 2642 } |
| 2643 | 2643 |
| 2644 Lisp_Object | 2644 Lisp_Object |
| 2645 make_weak_list (enum weak_list_type type) | 2645 make_weak_list (enum weak_list_type type) |
| 2646 { | 2646 { |
| 3103 | 3103 |
| 3104 return (internal_equal_0 (wb1->value, wb2->value, depth + 1, foldcase)); | 3104 return (internal_equal_0 (wb1->value, wb2->value, depth + 1, foldcase)); |
| 3105 } | 3105 } |
| 3106 | 3106 |
| 3107 static Hashcode | 3107 static Hashcode |
| 3108 weak_box_hash (Lisp_Object obj, int depth) | 3108 weak_box_hash (Lisp_Object obj, int depth, Boolint equalp) |
| 3109 { | 3109 { |
| 3110 struct weak_box *wb = XWEAK_BOX (obj); | 3110 struct weak_box *wb = XWEAK_BOX (obj); |
| 3111 | 3111 |
| 3112 return internal_hash (wb->value, depth + 1); | 3112 return internal_hash (wb->value, depth + 1, equalp); |
| 3113 } | 3113 } |
| 3114 | 3114 |
| 3115 Lisp_Object | 3115 Lisp_Object |
| 3116 make_weak_box (Lisp_Object value) | 3116 make_weak_box (Lisp_Object value) |
| 3117 { | 3117 { |
| 3324 internal_equal_0 (XEPHEMERON_REF (obj1), XEPHEMERON_REF(obj2), depth + 1, | 3324 internal_equal_0 (XEPHEMERON_REF (obj1), XEPHEMERON_REF(obj2), depth + 1, |
| 3325 foldcase); | 3325 foldcase); |
| 3326 } | 3326 } |
| 3327 | 3327 |
| 3328 static Hashcode | 3328 static Hashcode |
| 3329 ephemeron_hash(Lisp_Object obj, int depth) | 3329 ephemeron_hash(Lisp_Object obj, int depth, Boolint equalp) |
| 3330 { | 3330 { |
| 3331 return internal_hash (XEPHEMERON_REF (obj), depth + 1); | 3331 return internal_hash (XEPHEMERON_REF (obj), depth + 1, equalp); |
| 3332 } | 3332 } |
| 3333 | 3333 |
| 3334 Lisp_Object | 3334 Lisp_Object |
| 3335 make_ephemeron (Lisp_Object key, Lisp_Object value, Lisp_Object finalizer) | 3335 make_ephemeron (Lisp_Object key, Lisp_Object value, Lisp_Object finalizer) |
| 3336 { | 3336 { |