patch 9.0.0951: trying every character position for a match is inefficient
Problem: Trying every character position for a match is inefficient.
Solution: Use the start position of the match ignoring "\zs".
diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c
index 0228cfc..1702510 100644
--- a/src/regexp_nfa.c
+++ b/src/regexp_nfa.c
@@ -7378,7 +7378,14 @@
// 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 @@
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;
}
}