1 files changed, 41 insertions, 45 deletions

diff --git a/src/fns.c b/src/fns.c
index 039c208b0d3..3225fefc5e3 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -628,7 +628,7 @@ concat (ptrdiff_t nargs, Lisp_Object *args,
           ptrdiff_t thislen_byte = SBYTES (this);
 
           memcpy (SDATA (val) + toindex_byte, SDATA (this), SBYTES (this));
-          if (string_get_intervals (this))
+          if (string_intervals (this))
             {
               textprops[num_textprops].argnum = argnum;
               textprops[num_textprops].from = 0;
@@ -640,7 +640,7 @@ concat (ptrdiff_t nargs, Lisp_Object *args,
       /* Copy a single-byte string to a multibyte string.  */
       else if (STRINGP (this) && STRINGP (val))
         {
-          if (string_get_intervals (this))
+          if (string_intervals (this))
             {
               textprops[num_textprops].argnum = argnum;
               textprops[num_textprops].from = 0;
@@ -1060,7 +1060,7 @@ If you're not sure, whether to use `string-as-multibyte' or
         str_as_multibyte (SDATA (new_string), nbytes,
                           SBYTES (string), NULL);
       string = new_string;
-      string_set_intervals (string, NULL);
+      set_string_intervals (string, NULL);
     }
   return string;
 }
@@ -2139,19 +2139,15 @@ ARRAY is a vector, string, char-table, or bool-vector.  */)
   register ptrdiff_t size, idx;
 
   if (VECTORP (array))
-    {
-      register Lisp_Object *p = XVECTOR (array)->contents;
-      size = ASIZE (array);
-      for (idx = 0; idx < size; idx++)
-        p[idx] = item;
-    }
+    for (idx = 0, size = ASIZE (array); idx < size; idx++)
+      ASET (array, idx, item);
   else if (CHAR_TABLE_P (array))
     {
       int i;
 
       for (i = 0; i < (1 << CHARTAB_SIZE_BITS_0); i++)
-        char_table_set_contents (array, i, item);
-      CSET (XCHAR_TABLE (array), defalt, item);
+        set_char_table_contents (array, i, item);
+      set_char_table_defalt (array, item);
     }
   else if (STRINGP (array))
     {
@@ -3663,7 +3659,7 @@ make_hash_table (Lisp_Object test, Lisp_Object size, Lisp_Object rehash_size,
 
   /* Set up the free list.  */
   for (i = 0; i < sz - 1; ++i)
-    set_hash_next (h, i, make_number (i + 1));
+    set_hash_next_slot (h, i, make_number (i + 1));
   h->next_free = make_number (0);
 
   XSET_HASH_TABLE (table, h);
@@ -3760,17 +3756,17 @@ maybe_resize_hash_table (struct Lisp_Hash_Table *h)
         }
 #endif
 
-      h->key_and_value = larger_vector (h->key_and_value,
-                                        2 * (new_size - old_size), -1);
-      h->next = larger_vector (h->next, new_size - old_size, -1);
-      h->hash = larger_vector (h->hash, new_size - old_size, -1);
-      h->index = Fmake_vector (make_number (index_size), Qnil);
+      set_hash_key_and_value (h, larger_vector (h->key_and_value,
+                                                2 * (new_size - old_size), -1));
+      set_hash_next (h, larger_vector (h->next, new_size - old_size, -1));
+      set_hash_hash (h, larger_vector (h->hash, new_size - old_size, -1));
+      set_hash_index (h, Fmake_vector (make_number (index_size), Qnil));
 
       /* Update the free list.  Do it so that new entries are added at
          the end of the free list.  This makes some operations like
          maphash faster.  */
       for (i = old_size; i < new_size - 1; ++i)
-        set_hash_next (h, i, make_number (i + 1));
+        set_hash_next_slot (h, i, make_number (i + 1));
 
       if (!NILP (h->next_free))
         {
@@ -3781,7 +3777,7 @@ maybe_resize_hash_table (struct Lisp_Hash_Table *h)
                  !NILP (next))
             last = next;
 
-          set_hash_next (h, XFASTINT (last), make_number (old_size));
+          set_hash_next_slot (h, XFASTINT (last), make_number (old_size));
         }
       else
         XSETFASTINT (h->next_free, old_size);
@@ -3792,8 +3788,8 @@ maybe_resize_hash_table (struct Lisp_Hash_Table *h)
           {
             EMACS_UINT hash_code = XUINT (HASH_HASH (h, i));
             ptrdiff_t start_of_bucket = hash_code % ASIZE (h->index);
-            set_hash_next (h, i, HASH_INDEX (h, start_of_bucket));
-            set_hash_index (h, start_of_bucket, make_number (i));
+            set_hash_next_slot (h, i, HASH_INDEX (h, start_of_bucket));
+            set_hash_index_slot (h, start_of_bucket, make_number (i));
           }
     }
 }
@@ -3852,16 +3848,16 @@ hash_put (struct Lisp_Hash_Table *h, Lisp_Object key, Lisp_Object value,
   /* Store key/value in the key_and_value vector.  */
   i = XFASTINT (h->next_free);
   h->next_free = HASH_NEXT (h, i);
-  set_hash_key (h, i, key);
-  set_hash_value (h, i, value);
+  set_hash_key_slot (h, i, key);
+  set_hash_value_slot (h, i, value);
 
   /* Remember its hash code.  */
-  set_hash_hash (h, i, make_number (hash));
+  set_hash_hash_slot (h, i, make_number (hash));
 
   /* Add new entry to its collision chain.  */
   start_of_bucket = hash % ASIZE (h->index);
-  set_hash_next (h, i, HASH_INDEX (h, start_of_bucket));
-  set_hash_index (h, start_of_bucket, make_number (i));
+  set_hash_next_slot (h, i, HASH_INDEX (h, start_of_bucket));
+  set_hash_index_slot (h, start_of_bucket, make_number (i));
   return i;
 }
 
@@ -3892,16 +3888,16 @@ hash_remove_from_table (struct Lisp_Hash_Table *h, Lisp_Object key)
         {
           /* Take entry out of collision chain.  */
           if (NILP (prev))
-            set_hash_index (h, start_of_bucket, HASH_NEXT (h, i));
+            set_hash_index_slot (h, start_of_bucket, HASH_NEXT (h, i));
           else
-            set_hash_next (h, XFASTINT (prev), HASH_NEXT (h, i));
+            set_hash_next_slot (h, XFASTINT (prev), HASH_NEXT (h, i));
 
           /* Clear slots in key_and_value and add the slots to
              the free list.  */
-          set_hash_key (h, i, Qnil);
-          set_hash_value (h, i, Qnil);
-          set_hash_hash (h, i, Qnil);
-          set_hash_next (h, i, h->next_free);
+          set_hash_key_slot (h, i, Qnil);
+          set_hash_value_slot (h, i, Qnil);
+          set_hash_hash_slot (h, i, Qnil);
+          set_hash_next_slot (h, i, h->next_free);
           h->next_free = make_number (i);
           h->count--;
           eassert (h->count >= 0);
@@ -3927,10 +3923,10 @@ hash_clear (struct Lisp_Hash_Table *h)
 
       for (i = 0; i < size; ++i)
         {
-          set_hash_next (h, i, i < size - 1 ? make_number (i + 1) : Qnil);
-          set_hash_key (h, i, Qnil);
-          set_hash_value (h, i, Qnil);
-          set_hash_hash (h, i, Qnil);
+          set_hash_next_slot (h, i, i < size - 1 ? make_number (i + 1) : Qnil);
+          set_hash_key_slot (h, i, Qnil);
+          set_hash_value_slot (h, i, Qnil);
+          set_hash_hash_slot (h, i, Qnil);
         }
 
       for (i = 0; i < ASIZE (h->index); ++i)
@@ -3971,8 +3967,8 @@ sweep_weak_table (struct Lisp_Hash_Table *h, int remove_entries_p)
       for (idx = HASH_INDEX (h, bucket); !NILP (idx); idx = next)
         {
           ptrdiff_t i = XFASTINT (idx);
-          int key_known_to_survive_p = survives_gc_p (HASH_KEY (h, i));
-          int value_known_to_survive_p = survives_gc_p (HASH_VALUE (h, i));
+          bool key_known_to_survive_p = survives_gc_p (HASH_KEY (h, i));
+          bool value_known_to_survive_p = survives_gc_p (HASH_VALUE (h, i));
           int remove_p;
 
           if (EQ (h->weak, Qkey))
@@ -3994,18 +3990,18 @@ sweep_weak_table (struct Lisp_Hash_Table *h, int remove_entries_p)
                 {
                   /* Take out of collision chain.  */
                   if (NILP (prev))
-                    set_hash_index (h, bucket, next);
+                    set_hash_index_slot (h, bucket, next);
                   else
-                    set_hash_next (h, XFASTINT (prev), next);
+                    set_hash_next_slot (h, XFASTINT (prev), next);
 
                   /* Add to free list.  */
-                  set_hash_next (h, i, h->next_free);
+                  set_hash_next_slot (h, i, h->next_free);
                   h->next_free = idx;
 
                   /* Clear key, value, and hash.  */
-                  set_hash_key (h, i, Qnil);
-                  set_hash_value (h, i, Qnil);
-                  set_hash_hash (h, i, Qnil);
+                  set_hash_key_slot (h, i, Qnil);
+                  set_hash_value_slot (h, i, Qnil);
+                  set_hash_hash_slot (h, i, Qnil);
 
                   h->count--;
                 }
@@ -4512,7 +4508,7 @@ VALUE.  In any case, return VALUE.  */)
 
   i = hash_lookup (h, key, &hash);
   if (i >= 0)
-    set_hash_value (h, i, value);
+    set_hash_value_slot (h, i, value);
   else
     hash_put (h, key, value, hash);