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.

--- a/src/elhash.h	Mon Apr 05 00:18:49 2010 -0500
+++ b/src/elhash.h	Mon Apr 05 13:03:35 2010 +0100
@@ -74,7 +74,8 @@
 {
   HASH_TABLE_EQ,
   HASH_TABLE_EQL,
-  HASH_TABLE_EQUAL
+  HASH_TABLE_EQUAL,
+  HASH_TABLE_EQUALP
 };
 
 extern const struct memory_description hash_table_description[];
@@ -86,27 +87,34 @@
 EXFUN (Fremhash, 2);
 EXFUN (Fclrhash, 1);
 
-typedef int (*hash_table_test_function_t) (Lisp_Object obj1, Lisp_Object obj2);
-typedef Hashcode (*hash_table_hash_function_t) (Lisp_Object obj);
+typedef struct Hash_Table_Test Hash_Table_Test;
+
+DECLARE_LISP_OBJECT (hash_table_test, struct Hash_Table_Test);
+#define XHASH_TABLE_TEST(x) XRECORD (x, hash_table_test, struct Hash_Table_Test)
+#define wrap_hash_table_test(p) wrap_record (p, hash_table_test)
+#define HASH_TABLE_TESTP(x) RECORDP (x, hash_table_test)
+#define CHECK_HASH_TABLE_TEST(x) CHECK_RECORD (x, hash_table_test)
+#define CONCHECK_HASH_TABLE_TEST(x) CONCHECK_RECORD (x, hash_table_test)
+
+typedef int (*hash_table_equal_function_t) (const Hash_Table_Test *http,
+                                           Lisp_Object obj1, Lisp_Object obj2);
+typedef Hashcode (*hash_table_hash_function_t) (const Hash_Table_Test *http,
+                                                Lisp_Object obj);
 typedef int (*maphash_function_t) (Lisp_Object key, Lisp_Object value,
 				   void* extra_arg);
 
-Lisp_Object make_standard_lisp_hash_table (enum hash_table_test test,
-					   Elemcount size,
-					   double rehash_size,
-					   double rehash_threshold,
-					   enum hash_table_weakness weakness);
-
-Lisp_Object make_general_lisp_hash_table (hash_table_hash_function_t hash_function,
-					  hash_table_test_function_t test_function,
+/* test here is a Lisp_Object of type hash-table-test. You probably don't
+   want to call this, unless you have registered your own test. */
+Lisp_Object make_general_lisp_hash_table (Lisp_Object test,
 					  Elemcount size,
 					  double rehash_size,
 					  double rehash_threshold,
 					  enum hash_table_weakness weakness);
 
+/* test here is a symbol, e.g. Qeq, Qequal. */
 Lisp_Object make_lisp_hash_table (Elemcount size,
 				  enum hash_table_weakness weakness,
-				  enum hash_table_test test);
+                                  Lisp_Object test);
 
 void elisp_maphash (maphash_function_t function,
 		    Lisp_Object hash_table, void *extra_arg);
@@ -126,4 +134,12 @@
 
 htentry *find_htentry (Lisp_Object key, const Lisp_Hash_Table *ht);
 
+Lisp_Object define_hash_table_test (Lisp_Object name,
+                               hash_table_equal_function_t equal_function,
+                               hash_table_hash_function_t hash_function,
+                               Lisp_Object lisp_equal_function,
+                               Lisp_Object lisp_hash_function);
+
+void mark_hash_table_tests (void);
+
 #endif /* INCLUDED_elhash_h_ */