Mercurial > hg > xemacs-beta
diff src/lisp.h @ 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 | 1c1d8843de5e |
children | 70ed8a0d8da8 |
line wrap: on
line diff
--- a/src/lisp.h Mon Apr 05 00:18:49 2010 -0500 +++ b/src/lisp.h Mon Apr 05 13:03:35 2010 +0100 @@ -119,6 +119,7 @@ #include <stddef.h> /* offsetof */ #include <sys/types.h> #include <limits.h> +#include <math.h> #ifdef __cplusplus #include <limits> /* necessary for max()/min() under G++ 4 */ #endif @@ -2904,12 +2905,12 @@ #define CHECK_INT(x) do { \ if (!INTP (x)) \ - dead_wrong_type_argument (Qintegerp, x); \ + dead_wrong_type_argument (Qfixnump, x); \ } while (0) #define CONCHECK_INT(x) do { \ if (!INTP (x)) \ - x = wrong_type_argument (Qintegerp, x); \ + x = wrong_type_argument (Qfixnump, x); \ } while (0) /* NOTE NOTE NOTE! This definition of "natural number" is mathematically @@ -3130,6 +3131,10 @@ # define INT_OR_FLOATP(x) (INTP (x) || FLOATP (x)) +/* #### change for 64-bit machines */ +#define FLOAT_HASHCODE_FROM_DOUBLE(dbl) \ + (unsigned long)(fmod (dbl, 4e9)) + /*--------------------------- readonly objects -------------------------*/ #ifndef NEW_GC @@ -3705,8 +3710,9 @@ #define LISP_HASH(obj) ((unsigned long) STORE_LISP_IN_VOID (obj)) Hashcode memory_hash (const void *xv, Bytecount size); -Hashcode internal_hash (Lisp_Object obj, int depth); -Hashcode internal_array_hash (Lisp_Object *arr, int size, int depth); +Hashcode internal_hash (Lisp_Object obj, int depth, Boolint equalp); +Hashcode internal_array_hash (Lisp_Object *arr, int size, int depth, + Boolint equalp); /************************************************************************/ @@ -5255,6 +5261,11 @@ #undef SYMBOL_KEYWORD #undef SYMBOL_GENERAL +extern Lisp_Object Qeq; +extern Lisp_Object Qeql; +extern Lisp_Object Qequal; +extern Lisp_Object Qequalp; + /* Defined in glyphs.c */ EXFUN (Fmake_glyph_internal, 1);