aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-29 04:34:16 -04:00
Code Activity

patch 9.0.0951: trying every character position for a match is inefficient

Browse Source 
Problem:    Trying every character position for a match is inefficient.
Solution:   Use the start position of the match ignoring "\zs".
This commit is contained in:
Bram Moolenaar
2022-11-26 11:47:10 +00:00
parent c96311b5be
commit 01105b37a1
5 changed files with 34 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/regexp_nfa.c
View File

@@ -7378,7 +7378,14 @@ nfa_regexec_both(
// 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 && !rex.reg_icombine)
return find_match_text(col, prog->regstart, prog->match_text);
{
retval = find_match_text(col, prog->regstart, prog->match_text);
if (REG_MULTI)
rex.reg_mmatch->rmm_matchcol = col;
else
rex.reg_match->rm_matchcol = col;
return retval;
}
}
// If the start column is past the maximum column: no need to try.
@@ -7414,11 +7421,19 @@ theend:
if (end->lnum < start->lnum
|| (end->lnum == start->lnum && end->col < start->col))
rex.reg_mmatch->endpos[0] = rex.reg_mmatch->startpos[0];
// startpos[0] may be set by "\zs", also return the column where
// the whole pattern matched.
rex.reg_mmatch->rmm_matchcol = col;
}
else
{
if (rex.reg_match->endp[0] < rex.reg_match->startp[0])
rex.reg_match->endp[0] = rex.reg_match->startp[0];
// startpos[0] may be set by "\zs", also return the column where
// the whole pattern matched.
rex.reg_match->rm_matchcol = col;
}
}