Mercurial > hg > xemacs-beta

comparison src/gui.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 88bd4f3ef8e4
children 308d34e9f07d
comparison
equal deleted inserted replaced
5190:1c1d8843de5e 5191:71ee43b8a74d
594 594
595 return Qnil; 595 return Qnil;
596 } 596 }
597 597
598 static Hashcode 598 static Hashcode
599 gui_item_hash (Lisp_Object obj, int depth) 599 gui_item_hash (Lisp_Object obj, int depth, Boolint UNUSED (equalp))
600 { 600 {
601 Lisp_Gui_Item *p = XGUI_ITEM (obj); 601 Lisp_Gui_Item *p = XGUI_ITEM (obj);
602 602
603 return HASH2 (HASH6 (internal_hash (p->name, depth + 1), 603 return HASH2 (HASH6 (internal_hash (p->name, depth + 1, 0),
604 internal_hash (p->callback, depth + 1), 604 internal_hash (p->callback, depth + 1, 0),
605 internal_hash (p->callback_ex, depth + 1), 605 internal_hash (p->callback_ex, depth + 1, 0),
606 internal_hash (p->suffix, depth + 1), 606 internal_hash (p->suffix, depth + 1, 0),
607 internal_hash (p->active, depth + 1), 607 internal_hash (p->active, depth + 1, 0),
608 internal_hash (p->included, depth + 1)), 608 internal_hash (p->included, depth + 1, 0)),
609 HASH6 (internal_hash (p->config, depth + 1), 609 HASH6 (internal_hash (p->config, depth + 1, 0),
610 internal_hash (p->filter, depth + 1), 610 internal_hash (p->filter, depth + 1, 0),
611 internal_hash (p->style, depth + 1), 611 internal_hash (p->style, depth + 1, 0),
612 internal_hash (p->selected, depth + 1), 612 internal_hash (p->selected, depth + 1, 0),
613 internal_hash (p->keys, depth + 1), 613 internal_hash (p->keys, depth + 1, 0),
614 internal_hash (p->value, depth + 1))); 614 internal_hash (p->value, depth + 1, 0)));
615 } 615 }
616 616
617 int 617 int
618 gui_item_id_hash (Lisp_Object hashtable, Lisp_Object gitem, int slot) 618 gui_item_id_hash (Lisp_Object hashtable, Lisp_Object gitem, int slot)
619 { 619 {
620 int hashid = gui_item_hash (gitem, 0); 620 int hashid = gui_item_hash (gitem, 0, 0);
621 int id = GUI_ITEM_ID_BITS (hashid, slot); 621 int id = GUI_ITEM_ID_BITS (hashid, slot);
622 while (!UNBOUNDP (Fgethash (make_int (id), hashtable, Qunbound))) 622 while (!UNBOUNDP (Fgethash (make_int (id), hashtable, Qunbound)))
623 { 623 {
624 id = GUI_ITEM_ID_BITS (id + 1, slot); 624 id = GUI_ITEM_ID_BITS (id + 1, slot);
625 } 625 }