Mercurial > hg > xemacs-beta

comparison src/elhash.h @ 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 a9c41067dd88
children 308d34e9f07d
comparison
equal deleted inserted replaced
5190:1c1d8843de5e 5191:71ee43b8a74d
72 72
73 enum hash_table_test 73 enum hash_table_test
74 { 74 {
75 HASH_TABLE_EQ, 75 HASH_TABLE_EQ,
76 HASH_TABLE_EQL, 76 HASH_TABLE_EQL,
77 HASH_TABLE_EQUAL 77 HASH_TABLE_EQUAL,
78 HASH_TABLE_EQUALP
78 }; 79 };
79 80
80 extern const struct memory_description hash_table_description[]; 81 extern const struct memory_description hash_table_description[];
81 82
82 EXFUN (Fcopy_hash_table, 1); 83 EXFUN (Fcopy_hash_table, 1);
84 EXFUN (Fgethash, 3); 85 EXFUN (Fgethash, 3);
85 EXFUN (Fputhash, 3); 86 EXFUN (Fputhash, 3);
86 EXFUN (Fremhash, 2); 87 EXFUN (Fremhash, 2);
87 EXFUN (Fclrhash, 1); 88 EXFUN (Fclrhash, 1);
88 89
89 typedef int (*hash_table_test_function_t) (Lisp_Object obj1, Lisp_Object obj2); 90 typedef struct Hash_Table_Test Hash_Table_Test;
90 typedef Hashcode (*hash_table_hash_function_t) (Lisp_Object obj); 91
92 DECLARE_LISP_OBJECT (hash_table_test, struct Hash_Table_Test);
93 #define XHASH_TABLE_TEST(x) XRECORD (x, hash_table_test, struct Hash_Table_Test)
94 #define wrap_hash_table_test(p) wrap_record (p, hash_table_test)
95 #define HASH_TABLE_TESTP(x) RECORDP (x, hash_table_test)
96 #define CHECK_HASH_TABLE_TEST(x) CHECK_RECORD (x, hash_table_test)
97 #define CONCHECK_HASH_TABLE_TEST(x) CONCHECK_RECORD (x, hash_table_test)
98
99 typedef int (*hash_table_equal_function_t) (const Hash_Table_Test *http,
100 Lisp_Object obj1, Lisp_Object obj2);
101 typedef Hashcode (*hash_table_hash_function_t) (const Hash_Table_Test *http,
102 Lisp_Object obj);
91 typedef int (*maphash_function_t) (Lisp_Object key, Lisp_Object value, 103 typedef int (*maphash_function_t) (Lisp_Object key, Lisp_Object value,
92 void* extra_arg); 104 void* extra_arg);
93 105
94 Lisp_Object make_standard_lisp_hash_table (enum hash_table_test test, 106 /* test here is a Lisp_Object of type hash-table-test. You probably don't
95 Elemcount size, 107 want to call this, unless you have registered your own test. */
96 double rehash_size, 108 Lisp_Object make_general_lisp_hash_table (Lisp_Object test,
97 double rehash_threshold,
98 enum hash_table_weakness weakness);
99
100 Lisp_Object make_general_lisp_hash_table (hash_table_hash_function_t hash_function,
101 hash_table_test_function_t test_function,
102 Elemcount size, 109 Elemcount size,
103 double rehash_size, 110 double rehash_size,
104 double rehash_threshold, 111 double rehash_threshold,
105 enum hash_table_weakness weakness); 112 enum hash_table_weakness weakness);
106 113
114 /* test here is a symbol, e.g. Qeq, Qequal. */
107 Lisp_Object make_lisp_hash_table (Elemcount size, 115 Lisp_Object make_lisp_hash_table (Elemcount size,
108 enum hash_table_weakness weakness, 116 enum hash_table_weakness weakness,
109 enum hash_table_test test); 117 Lisp_Object test);
110 118
111 void elisp_maphash (maphash_function_t function, 119 void elisp_maphash (maphash_function_t function,
112 Lisp_Object hash_table, void *extra_arg); 120 Lisp_Object hash_table, void *extra_arg);
113 121
114 void elisp_maphash_unsafe (maphash_function_t function, 122 void elisp_maphash_unsafe (maphash_function_t function,
124 132
125 void inchash_eq (Lisp_Object key, Lisp_Object table, EMACS_INT offset); 133 void inchash_eq (Lisp_Object key, Lisp_Object table, EMACS_INT offset);
126 134
127 htentry *find_htentry (Lisp_Object key, const Lisp_Hash_Table *ht); 135 htentry *find_htentry (Lisp_Object key, const Lisp_Hash_Table *ht);
128 136
137 Lisp_Object define_hash_table_test (Lisp_Object name,
138 hash_table_equal_function_t equal_function,
139 hash_table_hash_function_t hash_function,
140 Lisp_Object lisp_equal_function,
141 Lisp_Object lisp_hash_function);
142
143 void mark_hash_table_tests (void);
144
129 #endif /* INCLUDED_elhash_h_ */ 145 #endif /* INCLUDED_elhash_h_ */