Mercurial > emacs
changeset 25501:9392c9b7dd07
(count_combining): Use the macro PARSE_MULTIBYTE_SEQ.
(string_char_to_byte): Likewise.
(string_byte_to_char): Likewise.
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Fri, 03 Sep 1999 01:28:42 +0000 |
| parents | 156172362ea9 |
| children | 4a69654961a6 |
| files | src/fns.c |
| diffstat | 1 files changed, 27 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/src/fns.c Fri Sep 03 01:28:42 1999 +0000 +++ b/src/fns.c Fri Sep 03 01:28:42 1999 +0000 @@ -526,16 +526,15 @@ unsigned char *str; int len, i; { - int j = i - 1; + int j = i - 1, bytes; if (i == 0 || i == len || CHAR_HEAD_P (str[i])) return 0; while (j >= 0 && !CHAR_HEAD_P (str[j])) j--; if (j < 0 || ! BASE_LEADING_CODE_P (str[j])) return 0; - j = i + 1; - while (j < len && ! CHAR_HEAD_P (str[j])) j++; - return j - i; + PARSE_MULTIBYTE_SEQ (str + j, len - j, bytes); + return (bytes <= i - j ? 0 : bytes - (i - j)); } /* This structure holds information of an argument of `concat' that is @@ -898,13 +897,19 @@ { while (best_above > char_index) { - int best_above_byte_saved = --best_above_byte; - - while (best_above_byte > 0 - && !CHAR_HEAD_P (XSTRING (string)->data[best_above_byte])) + unsigned char *pend = XSTRING (string)->data + best_above_byte; + unsigned char *pbeg = pend - best_above_byte; + unsigned char *p = pend - 1; + int bytes; + + while (p > pbeg && !CHAR_HEAD_P (*p)) p--; + PARSE_MULTIBYTE_SEQ (p, pend - p, bytes); + if (bytes == pend - p) + best_above_byte -= bytes; + else if (bytes > pend - p) + best_above_byte -= (pend - p); + else best_above_byte--; - if (!BASE_LEADING_CODE_P (XSTRING (string)->data[best_above_byte])) - best_above_byte = best_above_byte_saved; best_above--; } i = best_above; @@ -964,13 +969,19 @@ { while (best_above_byte > byte_index) { - int best_above_byte_saved = --best_above_byte; - - while (best_above_byte > 0 - && !CHAR_HEAD_P (XSTRING (string)->data[best_above_byte])) + unsigned char *pend = XSTRING (string)->data + best_above_byte; + unsigned char *pbeg = pend - best_above_byte; + unsigned char *p = pend - 1; + int bytes; + + while (p > pbeg && !CHAR_HEAD_P (*p)) p--; + PARSE_MULTIBYTE_SEQ (p, pend - p, bytes); + if (bytes == pend - p) + best_above_byte -= bytes; + else if (bytes > pend - p) + best_above_byte -= (pend - p); + else best_above_byte--; - if (!BASE_LEADING_CODE_P (XSTRING (string)->data[best_above_byte])) - best_above_byte = best_above_byte_saved; best_above--; } i = best_above;