Mercurial > vim
changeset 4924:6ae32a64e153 v7.3.1207
updated for version 7.3.1207
Problem: New regexp engine: no match found on "#if FOO". (Lech Lorens)
Solution: When adding a state gets skipped don't adjust the index.
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Sun, 16 Jun 2013 15:43:50 +0200 |
| parents | 7892cab5925d |
| children | cf776f1374d3 |
| files | src/regexp_nfa.c src/testdir/test64.in src/testdir/test64.ok src/version.c |
| diffstat | 4 files changed, 9 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/regexp_nfa.c +++ b/src/regexp_nfa.c @@ -4210,6 +4210,8 @@ addstate_here(l, state, subs, pim, ip) /* re-order to put the new state at the current position */ count = l->n - tlen; + if (count == 0) + return; /* no state got added */ if (count == 1) { /* overwrite the current state */
--- a/src/testdir/test64.in +++ b/src/testdir/test64.in @@ -408,6 +408,8 @@ STARTTEST :"""" Requiring lots of states. :call add(tl, [2, '[0-9a-zA-Z]\{8}-\([0-9a-zA-Z]\{4}-\)\{3}[0-9a-zA-Z]\{12}', " 12345678-1234-1234-1234-123456789012 ", "12345678-1234-1234-1234-123456789012", "1234-"]) :" +:"""" Skip adding state twice +:call add(tl, [2, '^\%(\%(^\s*#\s*if\>\|#\s*if\)\)\(\%>1c.*$\)\@=', "#if FOO", "#if", ' FOO']) :" :"""" Run the tests :"
--- a/src/testdir/test64.ok +++ b/src/testdir/test64.ok @@ -913,6 +913,9 @@ OK 2 - \_[^a]\+ OK 0 - [0-9a-zA-Z]\{8}-\([0-9a-zA-Z]\{4}-\)\{3}[0-9a-zA-Z]\{12} OK 1 - [0-9a-zA-Z]\{8}-\([0-9a-zA-Z]\{4}-\)\{3}[0-9a-zA-Z]\{12} OK 2 - [0-9a-zA-Z]\{8}-\([0-9a-zA-Z]\{4}-\)\{3}[0-9a-zA-Z]\{12} +OK 0 - ^\%(\%(^\s*#\s*if\>\|#\s*if\)\)\(\%>1c.*$\)\@= +OK 1 - ^\%(\%(^\s*#\s*if\>\|#\s*if\)\)\(\%>1c.*$\)\@= +OK 2 - ^\%(\%(^\s*#\s*if\>\|#\s*if\)\)\(\%>1c.*$\)\@= multi-line tests OK 0 - ^.\(.\).\_..\1. OK 1 - ^.\(.\).\_..\1.