Mercurial > vim
changeset 5502:5ad60cd88339 v7.4.100
updated for version 7.4.100
Problem: NFA regexp doesn't handle backreference correctly. (Ryuichi
Hayashida, Urtica Dioica)
Solution: Always add NFA_SKIP, also when it already exists at the start
position.
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Thu, 21 Nov 2013 16:03:40 +0100 |
| parents | 397bf7d448d1 |
| children | da865dd50ddc |
| files | src/regexp_nfa.c src/testdir/test64.in src/testdir/test64.ok src/version.c |
| diffstat | 4 files changed, 7 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/regexp_nfa.c +++ b/src/regexp_nfa.c @@ -4278,7 +4278,7 @@ addstate(l, state, subs_arg, pim, off) * endless loop for "\(\)*" */ default: - if (state->lastlist[nfa_ll_index] == l->id) + if (state->lastlist[nfa_ll_index] == l->id && state->c != NFA_SKIP) { /* This state is already in the list, don't add it again, * unless it is an MOPEN that is used for a backreference or
--- a/src/testdir/test64.in +++ b/src/testdir/test64.in @@ -406,6 +406,7 @@ STARTTEST :call add(tl, [2, '^.*\.\(.*\)/.\+\(\1\)\@<!$', 'foo.bat/foo.bat']) :call add(tl, [2, '^.*\.\(.*\)/.\+\(\1\)\@<=$', 'foo.bat/foo.bat', 'foo.bat/foo.bat', 'bat', 'bat']) :call add(tl, [2, '\\\@<!\${\(\d\+\%(:.\{-}\)\?\\\@<!\)}', '2013-06-27${0}', '${0}', '0']) +:call add(tl, [2, '^\(a*\)\1$', 'aaaaaaaa', 'aaaaaaaa', 'aaaa']) :" :"""" Look-behind with limit :call add(tl, [2, '<\@<=span.', 'xxspanxx<spanyyy', 'spany'])
--- a/src/testdir/test64.ok +++ b/src/testdir/test64.ok @@ -944,6 +944,9 @@ OK 2 - ^.*\.\(.*\)/.\+\(\1\)\@<=$ OK 0 - \\\@<!\${\(\d\+\%(:.\{-}\)\?\\\@<!\)} OK 1 - \\\@<!\${\(\d\+\%(:.\{-}\)\?\\\@<!\)} OK 2 - \\\@<!\${\(\d\+\%(:.\{-}\)\?\\\@<!\)} +OK 0 - ^\(a*\)\1$ +OK 1 - ^\(a*\)\1$ +OK 2 - ^\(a*\)\1$ OK 0 - <\@<=span. OK 1 - <\@<=span. OK 2 - <\@<=span.