Mercurial > vim
changeset 11269:121d29004998 v8.0.0520
patch 8.0.0520: using a function pointer while the function is known
commit https://github.com/vim/vim/commit/ace95989ed81929a84e205b26d0972cb9d6b4b19
Author: Bram Moolenaar <Bram@vim.org>
Date: Wed Mar 29 17:30:27 2017 +0200
patch 8.0.0520: using a function pointer while the function is known
Problem: Using a function pointer instead of the actual function, which we
know.
Solution: Change mb_ functions to utf_ functions when already checked for
Unicode. (Dominique Pelle, closes #1582)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Wed, 29 Mar 2017 17:45:06 +0200 |
| parents | 77ca1efd103a |
| children | eacea025e9b9 |
| files | src/message.c src/misc2.c src/regexp.c src/regexp_nfa.c src/screen.c src/spell.c src/version.c |
| diffstat | 7 files changed, 21 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/src/message.c +++ b/src/message.c @@ -315,7 +315,7 @@ trunc_string( for (;;) { do - half = half - (*mb_head_off)(s, s + half - 1) - 1; + half = half - utf_head_off(s, s + half - 1) - 1; while (half > 0 && utf_iscomposing(utf_ptr2char(s + half))); n = ptr2cells(s + half); if (len + n > room || half == 0)
--- a/src/misc2.c +++ b/src/misc2.c @@ -1874,7 +1874,7 @@ vim_strchr(char_u *string, int c) { while (*p != NUL) { - int l = (*mb_ptr2len)(p); + int l = utfc_ptr2len(p); /* Avoid matching an illegal byte here. */ if (utf_ptr2char(p) == c && l > 1)
--- a/src/regexp.c +++ b/src/regexp.c @@ -4732,7 +4732,7 @@ regmatch( break; } if (enc_utf8) - opndc = mb_ptr2char(opnd); + opndc = utf_ptr2char(opnd); if (enc_utf8 && utf_iscomposing(opndc)) { /* When only a composing char is given match at any @@ -4741,7 +4741,7 @@ regmatch( for (i = 0; reginput[i] != NUL; i += utf_ptr2len(reginput + i)) { - inpc = mb_ptr2char(reginput + i); + inpc = utf_ptr2char(reginput + i); if (!utf_iscomposing(inpc)) { if (i > 0) @@ -4750,7 +4750,7 @@ regmatch( else if (opndc == inpc) { /* Include all following composing chars. */ - len = i + mb_ptr2len(reginput + i); + len = i + utfc_ptr2len(reginput + i); status = RA_MATCH; break; }
--- a/src/regexp_nfa.c +++ b/src/regexp_nfa.c @@ -1974,7 +1974,7 @@ collection: nfa_do_multibyte: /* plen is length of current char with composing chars */ if (enc_utf8 && ((*mb_char2len)(c) - != (plen = (*mb_ptr2len)(old_regparse)) + != (plen = utfc_ptr2len(old_regparse)) || utf_iscomposing(c))) { int i = 0;
--- a/src/screen.c +++ b/src/screen.c @@ -4119,7 +4119,7 @@ win_line( c = c_extra; #ifdef FEAT_MBYTE mb_c = c; /* doesn't handle non-utf-8 multi-byte! */ - if (enc_utf8 && (*mb_char2len)(c) > 1) + if (enc_utf8 && utf_char2len(c) > 1) { mb_utf8 = TRUE; u8cc[0] = 0; @@ -4140,7 +4140,7 @@ win_line( { /* If the UTF-8 character is more than one byte: * Decode it into "mb_c". */ - mb_l = (*mb_ptr2len)(p_extra); + mb_l = utfc_ptr2len(p_extra); mb_utf8 = FALSE; if (mb_l > n_extra) mb_l = 1; @@ -4219,7 +4219,7 @@ win_line( { /* If the UTF-8 character is more than one byte: Decode it * into "mb_c". */ - mb_l = (*mb_ptr2len)(ptr); + mb_l = utfc_ptr2len(ptr); mb_utf8 = FALSE; if (mb_l > 1) { @@ -4612,7 +4612,7 @@ win_line( } #ifdef FEAT_MBYTE mb_c = c; - if (enc_utf8 && (*mb_char2len)(c) > 1) + if (enc_utf8 && utf_char2len(c) > 1) { mb_utf8 = TRUE; u8cc[0] = 0; @@ -4634,7 +4634,7 @@ win_line( } #ifdef FEAT_MBYTE mb_c = c; - if (enc_utf8 && (*mb_char2len)(c) > 1) + if (enc_utf8 && utf_char2len(c) > 1) { mb_utf8 = TRUE; u8cc[0] = 0; @@ -4765,7 +4765,7 @@ win_line( saved_attr2 = char_attr; /* save current attr */ #ifdef FEAT_MBYTE mb_c = c; - if (enc_utf8 && (*mb_char2len)(c) > 1) + if (enc_utf8 && utf_char2len(c) > 1) { mb_utf8 = TRUE; u8cc[0] = 0; @@ -4839,7 +4839,7 @@ win_line( } #ifdef FEAT_MBYTE mb_c = c; - if (enc_utf8 && (*mb_char2len)(c) > 1) + if (enc_utf8 && utf_char2len(c) > 1) { mb_utf8 = TRUE; u8cc[0] = 0; @@ -5003,7 +5003,7 @@ win_line( } # ifdef FEAT_MBYTE mb_c = c; - if (enc_utf8 && (*mb_char2len)(c) > 1) + if (enc_utf8 && utf_char2len(c) > 1) { mb_utf8 = TRUE; u8cc[0] = 0; @@ -5110,7 +5110,7 @@ win_line( extra_attr = HL_ATTR(HLF_AT); } mb_c = c; - if (enc_utf8 && (*mb_char2len)(c) > 1) + if (enc_utf8 && utf_char2len(c) > 1) { mb_utf8 = TRUE; u8cc[0] = 0; @@ -5383,7 +5383,7 @@ win_line( char_attr = HL_ATTR(HLF_AT); #ifdef FEAT_MBYTE mb_c = c; - if (enc_utf8 && (*mb_char2len)(c) > 1) + if (enc_utf8 && utf_char2len(c) > 1) { mb_utf8 = TRUE; u8cc[0] = 0;
--- a/src/spell.c +++ b/src/spell.c @@ -1208,7 +1208,7 @@ can_compound(slang_T *slang, char_u *wor /* Need to convert the single byte flags to utf8 characters. */ p = uflags; for (i = 0; flags[i] != NUL; ++i) - p += mb_char2bytes(flags[i], p); + p += utf_char2bytes(flags[i], p); *p = NUL; p = uflags; } @@ -5117,11 +5117,11 @@ suggest_trie_walk( * SCORE_SUBCOMP. */ if (enc_utf8 && utf_iscomposing( - mb_ptr2char(tword + utf_ptr2char(tword + sp->ts_twordlen - sp->ts_tcharlen)) && utf_iscomposing( - mb_ptr2char(fword + utf_ptr2char(fword + sp->ts_fcharstart))) sp->ts_score -= SCORE_SUBST - SCORE_SUBCOMP;