updated for version 7.3.1113

Problem:    New regexp engine: \%'m not supported.
Solution:   Implement \%'m.  Add tests.

diff --git a/src/regexp.c b/src/regexp.c
index b0c8a21924f55e92aeca4794d87f9360937d699d..3450f3aa90288c98ca3bc127ff63cff6ee2532a4 100644 (file)
--- a/src/regexp.c
+++ b/src/regexp.c
@@ -4401,8 +4401,7 @@ regmatch(scan)
            break;
 
          case RE_MARK:
-           /* Compare the mark position to the match position.  NOTE: Always
-            * uses the current buffer. */
+           /* Compare the mark position to the match position. */
            {
                int     mark = OPERAND(scan)[0];
                int     cmp = OPERAND(scan)[1];
@@ -4410,7 +4409,7 @@ regmatch(scan)
 
                pos = getmark_buf(reg_buf, mark, FALSE);
                if (pos == NULL              /* mark doesn't exist */
-                       || pos->lnum <= 0    /* mark isn't set (in curbuf) */
+                       || pos->lnum <= 0    /* mark isn't set in reg_buf */
                        || (pos->lnum == reglnum + reg_firstlnum
                                ? (pos->col == (colnr_T)(reginput - regline)
                                    ? (cmp == '<' || cmp == '>')

diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c
index 0a1dec697dfff9310b6f374a93195494b989c202..225b7d42bf6b4d398c84786f219219fe544f10d2 100644 (file)
--- a/src/regexp_nfa.c
+++ b/src/regexp_nfa.c
@@ -178,6 +178,9 @@ enum
     NFA_VCOL,          /*      Match cursor virtual column */
     NFA_VCOL_GT,       /*      Match > cursor virtual column */
     NFA_VCOL_LT,       /*      Match < cursor virtual column */
+    NFA_MARK,          /*      Match mark */
+    NFA_MARK_GT,       /*      Match > mark */
+    NFA_MARK_LT,       /*      Match < mark */
     NFA_VISUAL,                /*      Match Visual area */
 
     NFA_FIRST_NL = NFA_ANY + ADD_NL,
@@ -984,19 +987,27 @@ nfa_regatom()
                        {
                            EMIT(n);
                            if (c == 'l')
+                               /* \%{n}l  \%{n}<l  \%{n}>l  */
                                EMIT(cmp == '<' ? NFA_LNUM_LT :
-                                       cmp == '>' ? NFA_LNUM_GT : NFA_LNUM);
+                                    cmp == '>' ? NFA_LNUM_GT : NFA_LNUM);
                            else if (c == 'c')
+                               /* \%{n}c  \%{n}<c  \%{n}>c  */
                                EMIT(cmp == '<' ? NFA_COL_LT :
-                                       cmp == '>' ? NFA_COL_GT : NFA_COL);
+                                    cmp == '>' ? NFA_COL_GT : NFA_COL);
                            else
+                               /* \%{n}v  \%{n}<v  \%{n}>v  */
                                EMIT(cmp == '<' ? NFA_VCOL_LT :
-                                       cmp == '>' ? NFA_VCOL_GT : NFA_VCOL);
+                                    cmp == '>' ? NFA_VCOL_GT : NFA_VCOL);
+                           break;
+                       }
+                       else if (c == '\'' && n == 0)
+                       {
+                           /* \%'m  \%<'m  \%>'m  */
+                           EMIT(getchr());
+                           EMIT(cmp == '<' ? NFA_MARK_LT :
+                                cmp == '>' ? NFA_MARK_GT : NFA_MARK);
                            break;
                        }
-                       else if (c == '\'')
-                           /* TODO: \%'m not supported yet */
-                           return FAIL;
                    }
                    syntax_error = TRUE;
                    EMSGN(_("E867: (NFA) Unknown operator '\\%%%c'"),
@@ -1931,6 +1942,21 @@ nfa_set_code(c)
        case NFA_BOW:           STRCPY(code, "NFA_BOW "); break;
        case NFA_EOF:           STRCPY(code, "NFA_EOF "); break;
        case NFA_BOF:           STRCPY(code, "NFA_BOF "); break;
+       case NFA_LNUM:          STRCPY(code, "NFA_LNUM "); break;
+       case NFA_LNUM_GT:       STRCPY(code, "NFA_LNUM_GT "); break;
+       case NFA_LNUM_LT:       STRCPY(code, "NFA_LNUM_LT "); break;
+       case NFA_COL:           STRCPY(code, "NFA_COL "); break;
+       case NFA_COL_GT:        STRCPY(code, "NFA_COL_GT "); break;
+       case NFA_COL_LT:        STRCPY(code, "NFA_COL_LT "); break;
+       case NFA_VCOL:          STRCPY(code, "NFA_VCOL "); break;
+       case NFA_VCOL_GT:       STRCPY(code, "NFA_VCOL_GT "); break;
+       case NFA_VCOL_LT:       STRCPY(code, "NFA_VCOL_LT "); break;
+       case NFA_MARK:          STRCPY(code, "NFA_MARK "); break;
+       case NFA_MARK_GT:       STRCPY(code, "NFA_MARK_GT "); break;
+       case NFA_MARK_LT:       STRCPY(code, "NFA_MARK_LT "); break;
+       case NFA_CURSOR:        STRCPY(code, "NFA_CURSOR "); break;
+       case NFA_VISUAL:        STRCPY(code, "NFA_VISUAL "); break;
+
        case NFA_STAR:          STRCPY(code, "NFA_STAR "); break;
        case NFA_STAR_NONGREEDY: STRCPY(code, "NFA_STAR_NONGREEDY "); break;
        case NFA_QUEST:         STRCPY(code, "NFA_QUEST"); break;
@@ -2715,6 +2741,9 @@ post2nfa(postfix, end, nfa_calc_size)
        case NFA_COL:
        case NFA_COL_GT:
        case NFA_COL_LT:
+       case NFA_MARK:
+       case NFA_MARK_GT:
+       case NFA_MARK_LT:
            if (nfa_calc_size == TRUE)
            {
                nstate += 1;
@@ -2724,7 +2753,7 @@ post2nfa(postfix, end, nfa_calc_size)
            s = alloc_state(*p, NULL, NULL);
            if (s == NULL)
                goto theend;
-           s->val = e1.start->c;
+           s->val = e1.start->c; /* lnum, col or mark name */
            PUSH(frag(s, list1(&s->out)));
            break;
 
@@ -4723,6 +4752,30 @@ nfa_regmatch(prog, start, submatch, m)
                                                            t->pim, &listidx);
                break;
 
+           case NFA_MARK:
+           case NFA_MARK_GT:
+           case NFA_MARK_LT:
+             {
+               pos_T   *pos = getmark_buf(reg_buf, t->state->val, FALSE);
+
+               /* Compare the mark position to the match position. */
+               result = (pos != NULL                /* mark doesn't exist */
+                       && pos->lnum > 0    /* mark isn't set in reg_buf */
+                       && (pos->lnum == reglnum + reg_firstlnum
+                               ? (pos->col == (colnr_T)(reginput - regline)
+                                   ? t->state->c == NFA_MARK
+                                   : (pos->col < (colnr_T)(reginput - regline)
+                                       ? t->state->c == NFA_MARK_GT
+                                       : t->state->c == NFA_MARK_LT))
+                               : (pos->lnum < reglnum + reg_firstlnum
+                                   ? t->state->c == NFA_MARK_GT
+                                   : t->state->c == NFA_MARK_LT)));
+               if (result)
+                   addstate_here(thislist, t->state->out, &t->subs,
+                                                           t->pim, &listidx);
+               break;
+             }
+
            case NFA_CURSOR:
                result = (reg_win != NULL
                        && (reglnum + reg_firstlnum == reg_win->w_cursor.lnum)

diff --git a/src/testdir/test64.in b/src/testdir/test64.in
index 2531002203909d4d4378ad2d70f5ea0b8c05c443..65b4e33d70c5e694d9d982ab977bbfc37bec692a 100644 (file)
--- a/src/testdir/test64.in
+++ b/src/testdir/test64.in
@@ -466,6 +466,13 @@ jfx\16fxj:s/\%Vo/O/g
 :/^Visual/+1,/^Visual/+4yank
 Go\ep:"
 :"
+:" Check matching marks
+/^Marks:
+jfSmsfEme:.-4,.+6s/.\%>'s.*\%<'e../here/
+jfSmsj0fEme:.-4,.+6s/.\%>'s\_.*\%<'e../again/
+:/^Marks:/+1,/^Marks:/+3yank
+Go\ep:"
+:"
 :" Check patterns matching cursor position.
 :func! Postest()
  new
@@ -534,4 +541,9 @@ andaxand andaxand
 oooxofor foroxooo
 oooxofor foroxooo
 
+Marks:
+asdfSasdfsadfEasdf
+asdfSas
+dfsadfEasdf
+
 Results of test64:

diff --git a/src/testdir/test64.ok b/src/testdir/test64.ok
index 401f28ee0ef3908835f6236e61074f515d5c4f0d..418d46d371ad54c418af78e1e58adad142d81371 100644 (file)
--- a/src/testdir/test64.ok
+++ b/src/testdir/test64.ok
@@ -862,6 +862,10 @@ thexE thE thExethe
 AndAxAnd AndAxAnd
 oooxOfOr fOrOxooo
 oooxOfOr fOrOxooo
+
+asdfhereasdf
+asdfagainasdf
+
 -0-
 ffo
 bob

diff --git a/src/version.c b/src/version.c
index 649ce33e54127b1ceff484a8698e8acaefdb0b42..35c8807075d9b4c6647ebae463142006196ed520 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 */
+/**/
+    1113,
 /**/
     1112,
 /**/