mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-20 10:18:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

strings: Remove vim_strbyte

Browse Source 
Ref #1476
This commit is contained in:
ZyX
2017-04-06 21:31:37 +03:00
parent 19044a15f9
commit 171baaee93
6 changed files with 29 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/nvim/regexp.c
View File

@@ -3429,32 +3429,26 @@ static long bt_regexec_both(char_u *line,
c = *prog->regmust;
s = line + col;
/*
* This is used very often, esp. for ":global". Use three versions of
* the loop to avoid overhead of conditions.
*/
if (!ireg_ic
&& !has_mbyte
)
while ((s = vim_strbyte(s, c)) != NULL) {
if (cstrncmp(s, prog->regmust, &prog->regmlen) == 0)
break; /* Found it. */
++s;
}
else if (!ireg_ic || (!enc_utf8 && mb_char2len(c) > 1))
// This is used very often, esp. for ":global". Use two versions of
// the loop to avoid overhead of conditions.
if (!ireg_ic) {
while ((s = vim_strchr(s, c)) != NULL) {
if (cstrncmp(s, prog->regmust, &prog->regmlen) == 0)
break; /* Found it. */
if (cstrncmp(s, prog->regmust, &prog->regmlen) == 0) {
break; // Found it.
}
mb_ptr_adv(s);
}
else
} else {
while ((s = cstrchr(s, c)) != NULL) {
if (cstrncmp(s, prog->regmust, &prog->regmlen) == 0)
break; /* Found it. */
if (cstrncmp(s, prog->regmust, &prog->regmlen) == 0) {
break; // Found it.
}
mb_ptr_adv(s);
}
if (s == NULL) /* Not present. */
}
if (s == NULL) { // Not present.
goto theend;
}
}
regline = line;
@@ -3484,14 +3478,8 @@ static long bt_regexec_both(char_u *line,
/* Messy cases: unanchored match. */
while (!got_int) {
if (prog->regstart != NUL) {
/* Skip until the char we know it must start with.
* Used often, do some work to avoid call overhead. */
if (!ireg_ic
&& !has_mbyte
)
s = vim_strbyte(regline + col, prog->regstart);
else
s = cstrchr(regline + col, prog->regstart);
// Skip until the char we know it must start with.
s = cstrchr(regline + col, prog->regstart);
if (s == NULL) {
retval = 0;
break;