Mercurial > hg > xemacs-beta

comparison src/faces.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 97eb4942aec8
children 18c0b5909d16
comparison
equal deleted inserted replaced
5190:1c1d8843de5e 5191:71ee43b8a74d
176 176
177 ! plists_differ (f1->plist, f2->plist, 0, 0, depth + 1, 0)); 177 ! plists_differ (f1->plist, f2->plist, 0, 0, depth + 1, 0));
178 } 178 }
179 179
180 static Hashcode 180 static Hashcode
181 face_hash (Lisp_Object obj, int depth) 181 face_hash (Lisp_Object obj, int depth, Boolint UNUSED (equalp))
182 { 182 {
183 Lisp_Face *f = XFACE (obj); 183 Lisp_Face *f = XFACE (obj);
184 184
185 depth++; 185 depth++;
186 186
187 /* No need to hash all of the elements; that would take too long. 187 /* No need to hash all of the elements; that would take too long.
188 Just hash the most common ones. */ 188 Just hash the most common ones. */
189 return HASH3 (internal_hash (f->foreground, depth), 189 return HASH3 (internal_hash (f->foreground, depth, 0),
190 internal_hash (f->background, depth), 190 internal_hash (f->background, depth, 0),
191 internal_hash (f->font, depth)); 191 internal_hash (f->font, depth, 0));
192 } 192 }
193 193
194 static Lisp_Object 194 static Lisp_Object
195 face_getprop (Lisp_Object obj, Lisp_Object prop) 195 face_getprop (Lisp_Object obj, Lisp_Object prop)
196 { 196 {
2185 void 2185 void
2186 vars_of_faces (void) 2186 vars_of_faces (void)
2187 { 2187 {
2188 staticpro (&Vpermanent_faces_cache); 2188 staticpro (&Vpermanent_faces_cache);
2189 Vpermanent_faces_cache = 2189 Vpermanent_faces_cache =
2190 make_lisp_hash_table (10, HASH_TABLE_NON_WEAK, HASH_TABLE_EQ); 2190 make_lisp_hash_table (10, HASH_TABLE_NON_WEAK, Qeq);
2191 staticpro (&Vtemporary_faces_cache); 2191 staticpro (&Vtemporary_faces_cache);
2192 Vtemporary_faces_cache = 2192 Vtemporary_faces_cache =
2193 make_lisp_hash_table (0, HASH_TABLE_WEAK, HASH_TABLE_EQ); 2193 make_lisp_hash_table (0, HASH_TABLE_WEAK, Qeq);
2194 2194
2195 staticpro (&Vdefault_face); 2195 staticpro (&Vdefault_face);
2196 Vdefault_face = Qnil; 2196 Vdefault_face = Qnil;
2197 staticpro (&Vgui_element_face); 2197 staticpro (&Vgui_element_face);
2198 Vgui_element_face = Qnil; 2198 Vgui_element_face = Qnil;