aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

updated for version 7.3.1247

Browse Source 
Problem:    New regexp engine: '[ ]\@!\p\%([ ]\@!\p\)*:' does not always match.
Solution:   When there is a PIM add a duplicate state that starts at another
            position.
This commit is contained in:
Bram Moolenaar
2013-06-26 18:16:58 +02:00
parent b893ac2098
commit a0169128d9
4 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/regexp_nfa.c
View File

@@ -3642,14 +3642,14 @@ sub_equal(sub1, sub2)
if (i < sub1->in_use) if (i < sub1->in_use)
s1 = sub1->list.multi[i].start.lnum; s1 = sub1->list.multi[i].start.lnum;
else else
s1 = 0; s1 = -1;
if (i < sub2->in_use) if (i < sub2->in_use)
s2 = sub2->list.multi[i].start.lnum; s2 = sub2->list.multi[i].start.lnum;
else else
s2 = 0; s2 = -1;
if (s1 != s2) if (s1 != s2)
return FALSE; return FALSE;
if (s1 != 0 && sub1->list.multi[i].start.col if (s1 != -1 && sub1->list.multi[i].start.col
!= sub2->list.multi[i].start.col) != sub2->list.multi[i].start.col)
return FALSE; return FALSE;
} }
@@ -3931,8 +3931,9 @@ addstate(l, state, subs, pim, off)
if (state->lastlist[nfa_ll_index] == l->id) if (state->lastlist[nfa_ll_index] == l->id)
{ {
/* This state is already in the list, don't add it again, /* This state is already in the list, don't add it again,
* unless it is an MOPEN that is used for a backreference. */ * unless it is an MOPEN that is used for a backreference or
if (!nfa_has_backref) * when there is a PIM. */
if (!nfa_has_backref && pim == NULL)
{ {
skip_add: skip_add:
#ifdef ENABLE_LOG #ifdef ENABLE_LOG
@@ -3949,9 +3950,9 @@ skip_add:
goto skip_add; goto skip_add;
} }
/* When there are backreferences the number of states may be (a /* When there are backreferences or PIMs the number of states may
* lot) bigger than anticipated. */ * be (a lot) bigger than anticipated. */
if (nfa_has_backref && l->n == l->len) if (l->n == l->len)
{ {
int newlen = l->len * 3 / 2 + 50; int newlen = l->len * 3 / 2 + 50;

1
src/testdir/test64.in
View File

@@ -338,6 +338,7 @@ STARTTEST
:call add(tl, [2, '^\%(.*bar\)\@!.*\zsfoo', ' bar foo ']) :call add(tl, [2, '^\%(.*bar\)\@!.*\zsfoo', ' bar foo '])
:call add(tl, [2, '^\%(.*bar\)\@!.*\zsfoo', ' foo bar ']) :call add(tl, [2, '^\%(.*bar\)\@!.*\zsfoo', ' foo bar '])
:call add(tl, [2, '^\%(.*bar\)\@!.*\zsfoo', ' foo xxx ', 'foo']) :call add(tl, [2, '^\%(.*bar\)\@!.*\zsfoo', ' foo xxx ', 'foo'])
:call add(tl, [2, '[ ]\@!\p\%([ ]\@!\p\)*:', 'implicit mappings:', 'mappings:'])
:" :"
:"""" Combining different tests and features :"""" Combining different tests and features
:call add(tl, [2, '[[:alpha:]]\{-2,6}', '787abcdiuhsasiuhb4', 'ab']) :call add(tl, [2, '[[:alpha:]]\{-2,6}', '787abcdiuhsasiuhb4', 'ab'])

3
src/testdir/test64.ok
View File

@@ -770,6 +770,9 @@ OK 2 - ^\%(.*bar\)\@!.*\zsfoo
OK 0 - ^\%(.*bar\)\@!.*\zsfoo OK 0 - ^\%(.*bar\)\@!.*\zsfoo
OK 1 - ^\%(.*bar\)\@!.*\zsfoo OK 1 - ^\%(.*bar\)\@!.*\zsfoo
OK 2 - ^\%(.*bar\)\@!.*\zsfoo OK 2 - ^\%(.*bar\)\@!.*\zsfoo
OK 0 - [ ]\@!\p\%([ ]\@!\p\)*:
OK 1 - [ ]\@!\p\%([ ]\@!\p\)*:
OK 2 - [ ]\@!\p\%([ ]\@!\p\)*:
OK 0 - [[:alpha:]]\{-2,6} OK 0 - [[:alpha:]]\{-2,6}
OK 1 - [[:alpha:]]\{-2,6} OK 1 - [[:alpha:]]\{-2,6}
OK 2 - [[:alpha:]]\{-2,6} OK 2 - [[:alpha:]]\{-2,6}

2
src/version.c
View File

@@ -728,6 +728,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1247,
/**/ /**/
1246, 1246,
/**/ /**/