updated for version 7.3.1082

Problem:    New regexp engine: Problem with \@= matching.
Solution:   Save and restore nfa_match.

diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c
index 1dc56a3cee7c0b9670d5cc7aae2693c489f5d597..69370ace2ef00b1ab3b400e768c9980e1e303f87 100644 (file)
--- a/src/regexp_nfa.c
+++ b/src/regexp_nfa.c
@@ -3332,11 +3332,8 @@ nfa_regmatch(start, submatch, m)
     int                result;
     int                size = 0;
     int                flag = 0;
-    int                old_reglnum = -1;
     int                go_to_nextline = FALSE;
     nfa_thread_T *t;
-    char_u     *old_reginput = NULL;
-    char_u     *old_regline = NULL;
     nfa_list_T list[3];
     nfa_list_T *listtbl[2][2];
     nfa_list_T *ll;
@@ -3560,15 +3557,18 @@ nfa_regmatch(start, submatch, m)
                break;
 
            case NFA_START_INVISIBLE:
-               /* Save global variables, and call nfa_regmatch() to check if
-                * the current concat matches at this position. The concat
-                * ends with the node NFA_END_INVISIBLE */
-               old_reginput = reginput;
-               old_regline = regline;
-               old_reglnum = reglnum;
+             {
+               char_u  *save_reginput = reginput;
+               char_u  *save_regline = regline;
+               int     save_reglnum = reglnum;
+               int     save_nfa_match = nfa_match;
+
+               /* Call nfa_regmatch() to check if the current concat matches
+                * at this position. The concat ends with the node
+                * NFA_END_INVISIBLE */
                if (listids == NULL)
                {
-                   listids = (int *) lalloc(sizeof(int) * nstate, TRUE);
+                   listids = (int *)lalloc(sizeof(int) * nstate, TRUE);
                    if (listids == NULL)
                    {
                        EMSG(_("E878: (NFA) Could not allocate memory for branch traversal!"));
@@ -3588,7 +3588,12 @@ nfa_regmatch(start, submatch, m)
                result = nfa_regmatch(t->state->out, submatch, m);
                nfa_set_neg_listids(start);
                nfa_restore_listids(start, listids);
-               nfa_match = FALSE;
+
+               /* restore position in input text */
+               reginput = save_reginput;
+               regline = save_regline;
+               reglnum = save_reglnum;
+               nfa_match = save_nfa_match;
 
 #ifdef ENABLE_LOG
                log_fd = fopen(NFA_REGEXP_RUN_LOG, "a");
@@ -3610,10 +3615,6 @@ nfa_regmatch(start, submatch, m)
                {
                    int j;
 
-                   /* Restore position in input text */
-                   reginput = old_reginput;
-                   regline = old_regline;
-                   reglnum = old_reglnum;
                    /* Copy submatch info from the recursive call */
                    if (REG_MULTI)
                        for (j = 1; j < m->in_use; j++)
@@ -3635,12 +3636,8 @@ nfa_regmatch(start, submatch, m)
                    addstate_here(thislist, t->state->out1->out, &t->sub,
                                                                    &listidx);
                }
-               else
-               {
-                   /* continue with next input char */
-                   reginput = old_reginput;
-               }
                break;
+             }
 
            case NFA_BOL:
                if (reginput == regline)

diff --git a/src/testdir/test64.in b/src/testdir/test64.in
index 1f141658eb5227dc0cfa826cc325a6ea942f6059..45a71d2619e05dbda9c6e3dd89a1204b05217938 100644 (file)
--- a/src/testdir/test64.in
+++ b/src/testdir/test64.in
@@ -305,6 +305,7 @@ STARTTEST
 :call add(tl, [2, '\v(abc)@=..', 'xabcd', 'ab', 'abc'])
 :call add(tl, [2, '\(.*John\)\@=.*Bob', 'here is John, and here is B'])
 :call add(tl, [2, '\(John.*\)\@=.*Bob', 'John is Bobs friend', 'John is Bob', 'John is Bobs friend'])
+:call add(tl, [2, '\<\S\+\())\)\@=', '$((i=i+1))', 'i=i+1', '))'])
 :call add(tl, [2, '.*John\&.*Bob', 'here is John, and here is B'])
 :call add(tl, [2, '.*John\&.*Bob', 'John is Bobs friend', 'John is Bob'])
 :call add(tl, [2, '\v(test1)@=.*yep', 'this is a test1, yep it is', 'test1, yep', 'test1'])

diff --git a/src/testdir/test64.ok b/src/testdir/test64.ok
index ed4f52d70030e9bb7c5f58c9854e03516bee5651..2f96073cfcd941ed76feac715bfbde4e053b4622 100644 (file)
--- a/src/testdir/test64.ok
+++ b/src/testdir/test64.ok
@@ -669,6 +669,9 @@ OK 2 - \(.*John\)\@=.*Bob
 OK 0 - \(John.*\)\@=.*Bob
 OK 1 - \(John.*\)\@=.*Bob
 OK 2 - \(John.*\)\@=.*Bob
+OK 0 - \<\S\+\())\)\@=
+OK 1 - \<\S\+\())\)\@=
+OK 2 - \<\S\+\())\)\@=
 OK 0 - .*John\&.*Bob
 OK 1 - .*John\&.*Bob
 OK 2 - .*John\&.*Bob

diff --git a/src/version.c b/src/version.c
index 5a31c9fee29db07d93e9a34c62da0fba8c8fe44a..8db4fb4ce4c8c9321fb4abe7ef830c73ee9b581a 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -728,6 +728,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1082,
 /**/
     1081,
 /**/