Change type of `rehash_threshold' and `pure' fields in hash-tables

* src/lisp.h (struct Lisp_Hash_Table): Change type of
`rehash_threshold' and `pure' fields and move them after `count'.
* src/fns.c (make_hash_table): Change type of `rehash_threshold' and `pure'.
(Fmake_hash_table, Fhash_table_rehash_threshold):
* src/category.c (hash_get_category_set):
* src/xterm.c (syms_of_xterm):
* src/profiler.c (make_log):
* src/print.c (print_object):
* src/alloc.c (purecopy_hash_table, purecopy): Adjust accordingly.

1 files changed, 5 insertions, 7 deletions

diff --git a/src/print.c b/src/print.c
index db3d00f51f2..3a36a4eb54d 100644
--- a/src/print.c
+++ b/src/print.c
@@ -1812,16 +1812,14 @@ print_object (Lisp_Object obj, Lisp_Object printcharfun, bool escapeflag)
               print_object (h->rehash_size, printcharfun, escapeflag);
             }
 
-          if (!NILP (h->rehash_threshold))
-            {
-              print_c_string (" rehash-threshold ", printcharfun);
-              print_object (h->rehash_threshold, printcharfun, escapeflag);
-            }
+          print_c_string (" rehash-threshold ", printcharfun);
+          print_object (make_float (h->rehash_threshold),
+                        printcharfun, escapeflag);
 
-          if (!NILP (h->pure))
+          if (h->pure)
             {
               print_c_string (" purecopy ", printcharfun);
-              print_object (h->pure, printcharfun, escapeflag);
+              print_object (h->pure ? Qt : Qnil, printcharfun, escapeflag);
             }
 
           print_c_string (" data ", printcharfun);