diff options
Diffstat (limited to 'src/regexp_nfa.c')
| -rw-r--r-- | src/regexp_nfa.c | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c index 7cbfe0aee..d855df33b 100644 --- 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; + } } } |