diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2017-02-21 15:31:29 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2017-02-21 15:39:17 -0800 |
| commit | 83c9c6fc1cc943f239a021b42a8ca9b0e162198c (patch) | |
| tree | eb0a1840bc941357c4dffac5050776b5e8165cd3 /src/category.c | |
| parent | 5cbdaa98f975c870c4afa24346630a18b55f27ab (diff) | |
| download | emacs-83c9c6fc1cc943f239a021b42a8ca9b0e162198c.tar.gz emacs-83c9c6fc1cc943f239a021b42a8ca9b0e162198c.tar.bz2 emacs-83c9c6fc1cc943f239a021b42a8ca9b0e162198c.zip | |
Use float instead of Lisp_Object for rehash_size
* src/alloc.c (purecopy_hash_table):
* src/fns.c (maybe_resize_hash_table, Fmake_hash_table):
(Fhash_table_rehash_size):
* src/lisp.h (struct Lisp_Hash_Table.rehash_size):
The rehash_size member of struct Lisp_Hash_Table is now a
float, not a Lisp_Object.
* src/alloc.c (purecopy_hash_table): Assign members in order.
* src/fns.c (make_hash_table): Use EMACS_INT for size and
float for rehash_size, instead of Lisp_Object for both.
All callers changed.
* src/lisp.h (DEFAULT_REHASH_SIZE): Now float, not double,
and 1 smaller.
* src/print.c (print_object): Simplify by calling
Fhash_table_rehash_size and Fhash_table_rehash_threshold.
Avoid unnecessary NILP.
Diffstat (limited to 'src/category.c')
| -rw-r--r-- | src/category.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/category.c b/src/category.c index f5edd20c8a3..b633f65532a 100644 --- a/src/category.c +++ b/src/category.c @@ -64,9 +64,8 @@ hash_get_category_set (Lisp_Object table, Lisp_Object category_set) if (NILP (XCHAR_TABLE (table)->extras[1])) set_char_table_extras (table, 1, - make_hash_table (hashtest_equal, make_number (DEFAULT_HASH_SIZE), - make_float (DEFAULT_REHASH_SIZE), - DEFAULT_REHASH_THRESHOLD, + make_hash_table (hashtest_equal, DEFAULT_HASH_SIZE, + DEFAULT_REHASH_SIZE, DEFAULT_REHASH_THRESHOLD, Qnil, false)); h = XHASH_TABLE (XCHAR_TABLE (table)->extras[1]); i = hash_lookup (h, category_set, &hash); |