comparison src/menubar-msw.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 ae48681c47fa
children 635f4b506855
comparison
equal deleted inserted replaced
5190:1c1d8843de5e 5191:71ee43b8a74d
519 519
520 populate: 520 populate:
521 /* Come with empty hash table */ 521 /* Come with empty hash table */
522 if (NILP (FRAME_MSWINDOWS_MENU_HASH_TABLE (f))) 522 if (NILP (FRAME_MSWINDOWS_MENU_HASH_TABLE (f)))
523 FRAME_MSWINDOWS_MENU_HASH_TABLE (f) = 523 FRAME_MSWINDOWS_MENU_HASH_TABLE (f) =
524 make_lisp_hash_table (50, HASH_TABLE_NON_WEAK, HASH_TABLE_EQUAL); 524 make_lisp_hash_table (50, HASH_TABLE_NON_WEAK, Qequal);
525 else 525 else
526 Fclrhash (FRAME_MSWINDOWS_MENU_HASH_TABLE (f)); 526 Fclrhash (FRAME_MSWINDOWS_MENU_HASH_TABLE (f));
527 527
528 Fputhash (hmenu_to_lisp_object (menubar), Qnil, 528 Fputhash (hmenu_to_lisp_object (menubar), Qnil,
529 FRAME_MSWINDOWS_MENU_HASH_TABLE (f)); 529 FRAME_MSWINDOWS_MENU_HASH_TABLE (f));
830 830
831 menu_cleanup (f); 831 menu_cleanup (f);
832 832
833 current_menudesc = menu_desc; 833 current_menudesc = menu_desc;
834 current_hash_table = 834 current_hash_table =
835 make_lisp_hash_table (10, HASH_TABLE_NON_WEAK, HASH_TABLE_EQUAL); 835 make_lisp_hash_table (10, HASH_TABLE_NON_WEAK, Qequal);
836 menu = create_empty_popup_menu (); 836 menu = create_empty_popup_menu ();
837 Fputhash (hmenu_to_lisp_object (menu), Qnil, current_hash_table); 837 Fputhash (hmenu_to_lisp_object (menu), Qnil, current_hash_table);
838 top_level_menu = menu; 838 top_level_menu = menu;
839 839
840 /* see comments in menubar-x.c */ 840 /* see comments in menubar-x.c */