procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix glitches in recent hash table changes

Browse source 
* src/fns.c (Fmake_hash_table): Simplify the machine code slightly
by using 0 rather than -1.
* src/lisp.h (struct Lisp_Hash_Table.pure): Now bool rather
than a bitfield, for speed (the bitfield did not save space).
(struct Lisp_Hash_Table.rehash_threshold): Now double rather than
float, since the float caused unwanted rounding errors, e.g.,
(hash-table-rehash-threshold (make-hash-table)) yielded
0.800000011920929 instead of the correct 0.8.
This commit is contained in:
Paul Eggert 2017-02-19 12:22:33 -08:00
parent 5c1ebfc504
commit c8d14cfc6c
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/fns.c
View file

@ -4445,9 +4445,8 @@ usage: (make-hash-table &rest KEYWORD-ARGS) */)
/* Look for `:rehash-threshold THRESHOLD'. */
i = get_key_arg (QCrehash_threshold, nargs, args, used);
rehash_threshold =
i ? (FLOATP (args[i]) ? XFLOAT_DATA (args[i]) : -1.0)
: DEFAULT_REHASH_THRESHOLD;
rehash_threshold = (!i ? DEFAULT_REHASH_THRESHOLD
: FLOATP (args[i]) ? XFLOAT_DATA (args[i]) : 0);
if (! (0 < rehash_threshold && rehash_threshold <= 1))
signal_error ("Invalid hash table rehash threshold", args[i]);

10
src/lisp.h
View file

@ -1998,13 +1998,13 @@ struct Lisp_Hash_Table
/* Number of key/value entries in the table. */
ptrdiff_t count;
/* Non-nil if the table can be purecopied. The table cannot be
/* True if the table can be purecopied. The table cannot be
changed afterwards. */
bool_bf pure : 1;
bool pure;
/* Resize hash table when number of entries/ table size is >= this
ratio, a float. */
float rehash_threshold;
/* Resize hash table when number of entries / table size is >= this
ratio. */
double rehash_threshold;
/* Vector of keys and values. The key of item I is found at index
2 * I, the value is found at index 2 * I + 1.