diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/mbyte.c | 2 | ||||
| -rw-r--r-- | src/nvim/regexp.c | 35 |
2 files changed, 14 insertions, 23 deletions
diff --git a/src/nvim/mbyte.c b/src/nvim/mbyte.c index 0a7bb78102..c7a56209e4 100644 --- a/src/nvim/mbyte.c +++ b/src/nvim/mbyte.c @@ -1387,7 +1387,7 @@ bool mb_isalpha(int a) return mb_islower(a) || mb_isupper(a); } -int utf_strnicmp(const char *s1, const char *s2, size_t n1, size_t n2) +static int utf_strnicmp(const char *s1, const char *s2, size_t n1, size_t n2) { int c1, c2; char buffer[6]; diff --git a/src/nvim/regexp.c b/src/nvim/regexp.c index 32fb086ca6..a81990670a 100644 --- a/src/nvim/regexp.c +++ b/src/nvim/regexp.c @@ -1627,9 +1627,7 @@ static void mb_decompose(int c, int *c1, int *c2, int *c3) /// Compare two strings, ignore case if rex.reg_ic set. /// Return 0 if strings match, non-zero otherwise. -/// Correct the length "*n" when composing characters are ignored -/// or for utf8 when both utf codepoints are considered equal because of -/// case-folding but have different length (e.g. 's' and 'ſ') +/// Correct the length "*n" when composing characters are ignored. static int cstrncmp(char *s1, char *s2, int *n) { int result; @@ -1637,11 +1635,8 @@ static int cstrncmp(char *s1, char *s2, int *n) if (!rex.reg_ic) { result = strncmp(s1, s2, (size_t)(*n)); } else { - int l2 = utfc_ptr2len(s2); - result = utf_strnicmp(s1, s2, (size_t)(*n), (size_t)l2); - if (result == 0 && l2 < *n) { - *n = l2; - } + assert(*n >= 0); + result = mb_strnicmp(s1, s2, (size_t)(*n)); } // if it failed and it's utf8 and we want to combineignore: @@ -6495,9 +6490,11 @@ static bool regmatch(uint8_t *scan, const proftime_T *tm, int *timed_out) } } } else { - if (cstrncmp((char *)opnd, (char *)rex.input, &len) != 0) { - status = RA_NOMATCH; - break; + for (i = 0; i < len; i++) { + if (opnd[i] != rex.input[i]) { + status = RA_NOMATCH; + break; + } } } rex.input += len; @@ -13849,25 +13846,19 @@ static int skip_to_start(int c, colnr_T *colp) static int find_match_text(colnr_T *startcol, int regstart, uint8_t *match_text) { colnr_T col = *startcol; - const int regstart_len = utf_char2len(regstart); + const int regstart_len = utf_ptr2len((char *)rex.line + col); while (true) { bool match = true; uint8_t *s1 = match_text; - // skip regstart - uint8_t *s2 = rex.line + col + regstart_len; - if (regstart_len > 1 - && utf_char2len(utf_ptr2char((char *)rex.line + col)) != regstart_len) { - // because of case-folding of the previously matched text, we may need - // to skip fewer bytes than utf_char2len(regstart) - s2 = rex.line + col + utf_char2len(utf_fold(regstart)); - } + uint8_t *s2 = rex.line + col + regstart_len; // skip regstart while (*s1) { int c1_len = utf_ptr2len((char *)s1); int c1 = utf_ptr2char((char *)s1); int c2_len = utf_ptr2len((char *)s2); int c2 = utf_ptr2char((char *)s2); - if (c1 != c2 && (!rex.reg_ic || utf_fold(c1) != utf_fold(c2))) { + if ((c1 != c2 && (!rex.reg_ic || utf_fold(c1) != utf_fold(c2))) + || c1_len != c2_len) { match = false; break; } @@ -15531,7 +15522,7 @@ static int nfa_regexec_both(uint8_t *line, colnr_T startcol, proftime_T *tm, int // If match_text is set it contains the full text that must match. // Nothing else to try. Doesn't handle combining chars well. - if (prog->match_text != NULL && *prog->match_text != NUL && !rex.reg_icombine) { + if (prog->match_text != NULL && !rex.reg_icombine) { retval = find_match_text(&col, prog->regstart, prog->match_text); if (REG_MULTI) { rex.reg_mmatch->rmm_matchcol = col; |