Prefer more inline functions in character.h

* src/buffer.h (fetch_char_advance, fetch_char_advance_no_check)
(buf_next_char_len, next_char_len, buf_prev_char_len)
(prev_char_len, inc_both, dec_both): New inline functions,
replacing the old character.h macros FETCH_CHAR_ADVANCE,
FETCH_CHAR_ADVANCE_NO_CHECK, BUF_INC_POS, INC_POS, BUF_DEC_POS,
DEC_POS, INC_BOTH, DEC_BOTH respectively.  All callers changed.
These new functions all assume buffer primitives and so need
to be here rather than in character.h.
* src/casefiddle.c (make_char_unibyte): New static function,
replacing the old MAKE_CHAR_UNIBYTE macro.  All callers changed.
(do_casify_unibyte_string): Use SINGLE_BYTE_CHAR_P instead
of open-coding it.
* src/ccl.c (GET_TRANSLATION_TABLE): New static function,
replacing the old macro of the same name.
* src/character.c (string_char): Omit 2nd arg.  3rd arg can no
longer be NULL.  All callers changed.
* src/character.h (SINGLE_BYTE_CHAR_P): Move up.
(MAKE_CHAR_UNIBYTE, MAKE_CHAR_MULTIBYTE, PREV_CHAR_BOUNDARY)
(STRING_CHAR_AND_LENGTH, STRING_CHAR_ADVANCE)
(FETCH_STRING_CHAR_ADVANCE)
(FETCH_STRING_CHAR_AS_MULTIBYTE_ADVANCE)
(FETCH_STRING_CHAR_ADVANCE_NO_CHECK, FETCH_CHAR_ADVANCE)
(FETCH_CHAR_ADVANCE_NO_CHECK, INC_POS, DEC_POS, INC_BOTH)
(DEC_BOTH, BUF_INC_POS, BUF_DEC_POS): Remove.
(make_char_multibyte): New static function, replacing
the old macro MAKE_CHAR_MULTIBYTE.  All callers changed.
(CHAR_STRING_ADVANCE): Remove; all callers changed to use
CHAR_STRING.
(NEXT_CHAR_BOUNDARY): Remove; it was unused.
(raw_prev_char_len): New inline function, replacing the
old PREV_CHAR_BOUNDARY macro.  All callers changed.
(string_char_and_length): New inline function, replacing the
old STRING_CHAR_AND_LENGTH macro.  All callers changed.
(STRING_CHAR): Rewrite in terms of string_char_and_length.
(string_char_advance): New inline function, replacing the old
STRING_CHAR_ADVANCE macro.  All callers changed.
(fetch_string_char_advance): New inline function, replacing the
old FETCH_STRING_CHAR_ADVANCE macro.  All callers changed.
(fetch_string_char_as_multibyte_advance): New inline function,
replacing the old FETCH_STRING_CHAR_AS_MULTIBYTE_ADVANCE macro.
All callers changed.
(fetch_string_char_advance_no_check): New inline function,
replacing the old FETCH_STRING_CHAR_ADVANCE_NO_CHECK macro.  All
callers changed.
* src/regex-emacs.c (HEAD_ADDR_VSTRING): Remove; no longer used.
* src/syntax.c (scan_lists): Use dec_bytepos instead of
open-coding it.
* src/xdisp.c (string_char_and_length): Rename from
string_char_and_length to avoid name conflict with new function in
character.h.  All callers changed.

1 files changed, 12 insertions, 14 deletions

diff --git a/src/editfns.c b/src/editfns.c
index 90520d0dced..d9da119845a 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -999,7 +999,7 @@ At the beginning of the buffer or accessible region, return 0.  */)
   else if (!NILP (BVAR (current_buffer, enable_multibyte_characters)))
     {
       ptrdiff_t pos = PT_BYTE;
-      DEC_POS (pos);
+      pos -= prev_char_len (pos);
       XSETFASTINT (temp, FETCH_CHAR (pos));
     }
   else
@@ -1112,7 +1112,7 @@ If POS is out of range, the value is nil.  */)
 
   if (!NILP (BVAR (current_buffer, enable_multibyte_characters)))
     {
-      DEC_POS (pos_byte);
+      pos_byte -= prev_char_len (pos_byte);
       XSETFASTINT (val, FETCH_CHAR (pos_byte));
     }
   else
@@ -1549,7 +1549,7 @@ from adjoining text, if those properties are sticky.  */)
    make_uninit_string, which can cause the buffer arena to be
    compacted.  make_string has no way of knowing that the data has
    been moved, and thus copies the wrong data into the string.  This
-   doesn't effect most of the other users of make_string, so it should
+   doesn't affect most of the other users of make_string, so it should
    be left as is.  But we should use this function when conjuring
    buffer substrings.  */
 
@@ -1830,26 +1830,24 @@ determines whether case is significant or ignored.  */)
       if (! NILP (BVAR (bp1, enable_multibyte_characters)))
         {
           c1 = BUF_FETCH_MULTIBYTE_CHAR (bp1, i1_byte);
-          BUF_INC_POS (bp1, i1_byte);
+          i1_byte += buf_next_char_len (bp1, i1_byte);
           i1++;
         }
       else
         {
-          c1 = BUF_FETCH_BYTE (bp1, i1);
-          MAKE_CHAR_MULTIBYTE (c1);
+          c1 = make_char_multibyte (BUF_FETCH_BYTE (bp1, i1));
           i1++;
         }
 
       if (! NILP (BVAR (bp2, enable_multibyte_characters)))
         {
           c2 = BUF_FETCH_MULTIBYTE_CHAR (bp2, i2_byte);
-          BUF_INC_POS (bp2, i2_byte);
+          i2_byte += buf_next_char_len (bp2, i2_byte);
           i2++;
         }
       else
         {
-          c2 = BUF_FETCH_BYTE (bp2, i2);
-          MAKE_CHAR_MULTIBYTE (c2);
+          c2 = make_char_multibyte (BUF_FETCH_BYTE (bp2, i2));
           i2++;
         }
 
@@ -2304,7 +2302,7 @@ Both characters must have the same length of multi-byte form.  */)
         }
       p = BYTE_POS_ADDR (pos_byte);
       if (multibyte_p)
-        INC_POS (pos_byte_next);
+        pos_byte_next += next_char_len (pos_byte_next);
       else
         ++pos_byte_next;
       if (pos_byte_next - pos_byte == len
@@ -2365,7 +2363,7 @@ Both characters must have the same length of multi-byte form.  */)
                    decrease it now.  */
                 pos--;
               else
-                INC_POS (pos_byte_next);
+                pos_byte_next += next_char_len (pos_byte_next);
 
               if (! NILP (noundo))
                 bset_undo_list (current_buffer, tem);
@@ -2442,7 +2440,7 @@ check_translation (ptrdiff_t pos, ptrdiff_t pos_byte, ptrdiff_t end,
                         memcpy (bufalloc, buf, sizeof initial_buf);
                       buf = bufalloc;
                     }
-                  buf[buf_used++] = STRING_CHAR_AND_LENGTH (p, len1);
+                  buf[buf_used++] = string_char_and_length (p, &len1);
                   pos_byte += len1;
                 }
               if (XFIXNUM (AREF (elt, i)) != buf[i])
@@ -2501,7 +2499,7 @@ It returns the number of characters changed.  */)
       int len, oc;
 
       if (multibyte)
-        oc = STRING_CHAR_AND_LENGTH (p, len);
+        oc = string_char_and_length (p, &len);
       else
         oc = *p, len = 1;
       if (oc < translatable_chars)
@@ -2518,7 +2516,7 @@ It returns the number of characters changed.  */)
               if (string_multibyte)
                 {
                   str = tt + string_char_to_byte (table, oc);
-                  nc = STRING_CHAR_AND_LENGTH (str, str_len);
+                  nc = string_char_and_length (str, &str_len);
                 }
               else
                 {