Mercurial > vim
changeset 5893:99374096a76b v7.4.289
updated for version 7.4.289
Problem: Pattern with repeated backreference does not match with new regexp
engine. (Urtica Dioica)
Solution: Also check the end of a submatch when deciding to put a state in
the state list.
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Tue, 13 May 2014 15:56:51 +0200 |
| parents | c545fd75b0ac |
| children | ff44a3a57ba0 |
| files | src/regexp_nfa.c src/testdir/test64.in src/testdir/test64.ok src/version.c |
| diffstat | 4 files changed, 37 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/regexp_nfa.c +++ b/src/regexp_nfa.c @@ -3945,6 +3945,7 @@ copy_ze_off(to, from) /* * Return TRUE if "sub1" and "sub2" have the same start positions. + * When using back-references also check the end position. */ static int sub_equal(sub1, sub2) @@ -3976,6 +3977,23 @@ sub_equal(sub1, sub2) if (s1 != -1 && sub1->list.multi[i].start.col != sub2->list.multi[i].start.col) return FALSE; + + if (nfa_has_backref) + { + if (i < sub1->in_use) + s1 = sub1->list.multi[i].end.lnum; + else + s1 = -1; + if (i < sub2->in_use) + s2 = sub2->list.multi[i].end.lnum; + else + s2 = -1; + if (s1 != s2) + return FALSE; + if (s1 != -1 && sub1->list.multi[i].end.col + != sub2->list.multi[i].end.col) + return FALSE; + } } } else @@ -3992,6 +4010,19 @@ sub_equal(sub1, sub2) sp2 = NULL; if (sp1 != sp2) return FALSE; + if (nfa_has_backref) + { + if (i < sub1->in_use) + sp1 = sub1->list.line[i].end; + else + sp1 = NULL; + if (i < sub2->in_use) + sp2 = sub2->list.line[i].end; + else + sp2 = NULL; + if (sp1 != sp2) + return FALSE; + } } }
--- a/src/testdir/test64.in +++ b/src/testdir/test64.in @@ -407,6 +407,7 @@ STARTTEST :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']) +:call add(tl, [2, '^\(a\{-2,}\)\1\+$', 'aaaaaaaaa', 'aaaaaaaaa', 'aaa']) :" :"""" Look-behind with limit :call add(tl, [2, '<\@<=span.', 'xxspanxx<spanyyy', 'spany'])
--- a/src/testdir/test64.ok +++ b/src/testdir/test64.ok @@ -947,6 +947,9 @@ OK 2 - \\\@<!\${\(\d\+\%(:.\{-}\)\?\\\@< OK 0 - ^\(a*\)\1$ OK 1 - ^\(a*\)\1$ OK 2 - ^\(a*\)\1$ +OK 0 - ^\(a\{-2,}\)\1\+$ +OK 1 - ^\(a\{-2,}\)\1\+$ +OK 2 - ^\(a\{-2,}\)\1\+$ OK 0 - <\@<=span. OK 1 - <\@<=span. OK 2 - <\@<=span.