Mercurial > vim
changeset 4692:08fbb1ce1bc5 v7.3.1093
updated for version 7.3.1093
Problem: New regexp engine: When a sub expression is empty \1 skips a
character.
Solution: Make \1 try the current position when the match is emtpy.
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Sun, 02 Jun 2013 16:07:10 +0200 |
| parents | 36da87ebfdfe |
| children | f383ba0aab3a |
| files | src/regexp_nfa.c src/testdir/test64.in src/testdir/test64.ok src/version.c |
| diffstat | 4 files changed, 9 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/regexp_nfa.c +++ b/src/regexp_nfa.c @@ -4435,11 +4435,10 @@ nfa_regmatch(start, submatch, m, endp) { if (bytelen == 0) { - /* empty match always works, add NFA_SKIP with zero to - * be used next */ - addstate_here(thislist, t->state->out, &t->subs, + /* empty match always works, output of NFA_SKIP to be + * used next */ + addstate_here(thislist, t->state->out->out, &t->subs, &listidx); - thislist->t[listidx + 1].count = 0; } else if (bytelen <= clen) {
--- a/src/testdir/test64.in +++ b/src/testdir/test64.in @@ -361,6 +361,7 @@ STARTTEST :call add(tl, [2, '\(\i\+\) \1', ' abc abc', 'abc abc', 'abc']) :call add(tl, [2, '\(\i\+\) \1', 'xgoo goox', 'goo goo', 'goo']) :call add(tl, [2, '\(a\)\(b\)\(c\)\(dd\)\(e\)\(f\)\(g\)\(h\)\(i\)\1\2\3\4\5\6\7\8\9', 'xabcddefghiabcddefghix', 'abcddefghiabcddefghi', 'a', 'b', 'c', 'dd', 'e', 'f', 'g', 'h', 'i']) +:call add(tl, [2, '\(\d*\)a \1b', ' a b ', 'a b', '']) :" :"""" Look-behind with limit :call add(tl, [2, '<\@<=span.', 'xxspanxx<spanyyy', 'spany'])
--- a/src/testdir/test64.ok +++ b/src/testdir/test64.ok @@ -815,6 +815,9 @@ OK 2 - \(\i\+\) \1 OK 0 - \(a\)\(b\)\(c\)\(dd\)\(e\)\(f\)\(g\)\(h\)\(i\)\1\2\3\4\5\6\7\8\9 OK 1 - \(a\)\(b\)\(c\)\(dd\)\(e\)\(f\)\(g\)\(h\)\(i\)\1\2\3\4\5\6\7\8\9 OK 2 - \(a\)\(b\)\(c\)\(dd\)\(e\)\(f\)\(g\)\(h\)\(i\)\1\2\3\4\5\6\7\8\9 +OK 0 - \(\d*\)a \1b +OK 1 - \(\d*\)a \1b +OK 2 - \(\d*\)a \1b OK 0 - <\@<=span. OK 1 - <\@<=span. OK 2 - <\@<=span.