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.
diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c
index 7cbfe0a..d855df3 100644
--- a/src/regexp_nfa.c
+++ b/src/regexp_nfa.c
@@ -3945,6 +3945,7 @@
/*
* 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 @@
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 @@
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;
+ }
}
}
diff --git a/src/testdir/test64.in b/src/testdir/test64.in
index 29bf0b9..e3f5d82 100644
--- a/src/testdir/test64.in
+++ b/src/testdir/test64.in
@@ -407,6 +407,7 @@
: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'])
diff --git a/src/testdir/test64.ok b/src/testdir/test64.ok
index a1498ea..9fb6c60 100644
--- a/src/testdir/test64.ok
+++ b/src/testdir/test64.ok
@@ -947,6 +947,9 @@
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.
diff --git a/src/version.c b/src/version.c
index 13c5ec9..81ce691 100644
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 289,
+/**/
288,
/**/
287,
