Mercurial > hg > xemacs-beta

comparison src/events.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 1fae11d56ad2
children c096d8051f89 308d34e9f07d
comparison
equal deleted inserted replaced
5190:1c1d8843de5e 5191:71ee43b8a74d
431 return 1; 431 return 1;
432 } 432 }
433 } 433 }
434 434
435 static Hashcode 435 static Hashcode
436 event_hash (Lisp_Object obj, int depth) 436 event_hash (Lisp_Object obj, int depth, Boolint UNUSED (equalp))
437 { 437 {
438 Lisp_Event *e = XEVENT (obj); 438 Lisp_Event *e = XEVENT (obj);
439 Hashcode hash; 439 Hashcode hash;
440 440
441 hash = HASH2 (e->event_type, LISP_HASH (e->channel)); 441 hash = HASH2 (e->event_type, LISP_HASH (e->channel));
444 case process_event: 444 case process_event:
445 return HASH2 (hash, LISP_HASH (EVENT_PROCESS_PROCESS (e))); 445 return HASH2 (hash, LISP_HASH (EVENT_PROCESS_PROCESS (e)));
446 446
447 case timeout_event: 447 case timeout_event:
448 return HASH3 (hash, 448 return HASH3 (hash,
449 internal_hash (EVENT_TIMEOUT_FUNCTION (e), depth + 1), 449 internal_hash (EVENT_TIMEOUT_FUNCTION (e), depth + 1, 0),
450 internal_hash (EVENT_TIMEOUT_OBJECT (e), depth + 1)); 450 internal_hash (EVENT_TIMEOUT_OBJECT (e), depth + 1, 0));
451 451
452 case key_press_event: 452 case key_press_event:
453 return HASH3 (hash, LISP_HASH (EVENT_KEY_KEYSYM (e)), 453 return HASH3 (hash, LISP_HASH (EVENT_KEY_KEYSYM (e)),
454 EVENT_KEY_MODIFIERS (e)); 454 EVENT_KEY_MODIFIERS (e));
455 455
460 case pointer_motion_event: 460 case pointer_motion_event:
461 return HASH3 (hash, EVENT_MOTION_X (e), EVENT_MOTION_Y (e)); 461 return HASH3 (hash, EVENT_MOTION_X (e), EVENT_MOTION_Y (e));
462 462
463 case misc_user_event: 463 case misc_user_event:
464 return HASH5 (hash, 464 return HASH5 (hash,
465 internal_hash (EVENT_MISC_USER_FUNCTION (e), depth + 1), 465 internal_hash (EVENT_MISC_USER_FUNCTION (e), depth + 1, 0),
466 internal_hash (EVENT_MISC_USER_OBJECT (e), depth + 1), 466 internal_hash (EVENT_MISC_USER_OBJECT (e), depth + 1, 0),
467 EVENT_MISC_USER_BUTTON (e), EVENT_MISC_USER_MODIFIERS (e)); 467 EVENT_MISC_USER_BUTTON (e), EVENT_MISC_USER_MODIFIERS (e));
468 468
469 case eval_event: 469 case eval_event:
470 return HASH3 (hash, internal_hash (EVENT_EVAL_FUNCTION (e), depth + 1), 470 return HASH3 (hash, internal_hash (EVENT_EVAL_FUNCTION (e), depth + 1, 0),
471 internal_hash (EVENT_EVAL_OBJECT (e), depth + 1)); 471 internal_hash (EVENT_EVAL_OBJECT (e), depth + 1, 0));
472 472
473 case magic_eval_event: 473 case magic_eval_event:
474 return HASH3 (hash, 474 return HASH3 (hash,
475 (Hashcode) EVENT_MAGIC_EVAL_INTERNAL_FUNCTION (e), 475 (Hashcode) EVENT_MAGIC_EVAL_INTERNAL_FUNCTION (e),
476 internal_hash (EVENT_MAGIC_EVAL_OBJECT (e), depth + 1)); 476 internal_hash (EVENT_MAGIC_EVAL_OBJECT (e), depth + 1, 0));
477 477
478 case magic_event: 478 case magic_event:
479 return HASH2 (hash, event_stream_hash_magic_event (e)); 479 return HASH2 (hash, event_stream_hash_magic_event (e));
480 480
481 case empty_event: 481 case empty_event: