updated for version 7.3.1021

Problem:    New regexp engine does not ignore order of composing chars.
Solution:   Ignore composing chars order.

diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c
index 56098d3c17c37757d612df5959431ccb757308de..11c011977362c90bc56e053f65d6b495e0389437 100644 (file)
--- a/src/regexp_nfa.c
+++ b/src/regexp_nfa.c
@@ -3275,8 +3275,10 @@ nfa_regmatch(start, submatch, m)
                int         len = 0;
                nfa_state_T *end;
                nfa_state_T *sta;
+               int         cchars[MAX_MCO];
+               int         ccount = 0;
+               int         j;
 
-               result = OK;
                sta = t->state->out;
                len = 0;
                if (utf_iscomposing(sta->c))
@@ -3293,24 +3295,52 @@ nfa_regmatch(start, submatch, m)
                    /* TODO: How about negated? */
                    if (len == 0 && sta->c != c)
                        result = FAIL;
-                   len = n;
+                   else
+                       result = OK;
                    while (sta->c != NFA_END_COMPOSING)
                        sta = sta->out;
                }
-               else
-                   while (sta->c != NFA_END_COMPOSING && len < n)
+
+               /* Check base character matches first, unless ignored. */
+               else if (len > 0 || mc == sta->c)
+               {
+                   if (len == 0)
                    {
-                       if (len > 0)
-                           mc = mb_ptr2char(reginput + len);
-                       if (mc != sta->c)
-                           break;
                        len += mb_char2len(mc);
                        sta = sta->out;
                    }
 
-               /* if input char length doesn't match regexp char length */
-               if (len < n || sta->c != NFA_END_COMPOSING)
+                   /* We don't care about the order of composing characters.
+                    * Get them into cchars[] first. */
+                   while (len < n)
+                   {
+                       mc = mb_ptr2char(reginput + len);
+                       cchars[ccount++] = mc;
+                       len += mb_char2len(mc);
+                       if (ccount == MAX_MCO)
+                           break;
+                   }
+
+                   /* Check that each composing char in the pattern matches a
+                    * composing char in the text.  We do not check if all
+                    * composing chars are matched. */
+                   result = OK;
+                   while (sta->c != NFA_END_COMPOSING)
+                   {
+                       for (j = 0; j < ccount; ++j)
+                           if (cchars[j] == sta->c)
+                               break;
+                       if (j == ccount)
+                       {
+                           result = FAIL;
+                           break;
+                       }
+                       sta = sta->out;
+                   }
+               }
+               else
                    result = FAIL;
+
                end = t->state->out1;       /* NFA_END_COMPOSING */
                ADD_POS_NEG_STATE(end);
                break;

diff --git a/src/testdir/test95.in b/src/testdir/test95.in
index 9c3ca8f1ddb8d6a60433b0aff25739743b6e0eb8..0f678794e9f16857d064d68ae6654e80b14dc8c1 100644 (file)
--- a/src/testdir/test95.in
+++ b/src/testdir/test95.in
@@ -9,6 +9,7 @@ STARTTEST
 :so mbyte.vim
 :set nocp encoding=utf-8 viminfo+=nviminfo nomore
 :" tl is a List of Lists with:
+:"    2: test auto/old/new  0: test auto/old  1: test auto/new
 :"    regexp pattern
 :"    text to test the pattern on
 :"    expected match (optional)
@@ -40,10 +41,14 @@ STARTTEST
 :call add(tl, [2, ".\u05b9", " x\u05b9 ", "x\u05b9"])
 :call add(tl, [2, "\u05b9\u05bb", " x\u05b9\u05bb ", "x\u05b9\u05bb"])
 :call add(tl, [2, ".\u05b9\u05bb", " x\u05b9\u05bb ", "x\u05b9\u05bb"])
-:"call add(tl, [2, "\u05bb\u05b9", " x\u05b9\u05bb "])
-:"call add(tl, [2, ".\u05bb\u05b9", " x\u05b9\u05bb "])
+:call add(tl, [2, "\u05bb\u05b9", " x\u05b9\u05bb ", "x\u05b9\u05bb"])
+:call add(tl, [2, ".\u05bb\u05b9", " x\u05b9\u05bb ", "x\u05b9\u05bb"])
 :call add(tl, [2, "\u05b9", " y\u05bb x\u05b9 ", "x\u05b9"])
 :call add(tl, [2, ".\u05b9", " y\u05bb x\u05b9 ", "x\u05b9"])
+:call add(tl, [2, "\u05b9", " y\u05bb\u05b9 x\u05b9 ", "y\u05bb\u05b9"])
+:call add(tl, [2, ".\u05b9", " y\u05bb\u05b9 x\u05b9 ", "y\u05bb\u05b9"])
+:call add(tl, [1, "\u05b9\u05bb", " y\u05b9 x\u05b9\u05bb ", "x\u05b9\u05bb"])
+:call add(tl, [2, ".\u05b9\u05bb", " y\u05bb x\u05b9\u05bb ", "x\u05b9\u05bb"])
 
 
 :"""" Test \Z
@@ -74,7 +79,7 @@ STARTTEST
 :  let text = t[2]
 :  let matchidx = 3
 :  for engine in [0, 1, 2]
-:    if engine == 2 && !re
+:    if engine == 2 && re == 0 || engine == 1 && re == 1
 :      continue
 :    endif
 :    let &regexpengine = engine

diff --git a/src/testdir/test95.ok b/src/testdir/test95.ok
index a2e3d86260c7e2a59a4f815afebf765654f5a279..3fafb8f52666faf765b6516fff434a47f22b8f8d 100644 (file)
--- a/src/testdir/test95.ok
+++ b/src/testdir/test95.ok
@@ -41,12 +41,29 @@ OK 2 - ֹֻ
 OK 0 - .ֹֻ
 OK 1 - .ֹֻ
 OK 2 - .ֹֻ
+OK 0 - ֹֻ
+OK 1 - ֹֻ
+OK 2 - ֹֻ
+OK 0 - .ֹֻ
+OK 1 - .ֹֻ
+OK 2 - .ֹֻ
 OK 0 - ֹ
 OK 1 - ֹ
 OK 2 - ֹ
 OK 0 - .ֹ
 OK 1 - .ֹ
 OK 2 - .ֹ
+OK 0 - ֹ
+OK 1 - ֹ
+OK 2 - ֹ
+OK 0 - .ֹ
+OK 1 - .ֹ
+OK 2 - .ֹ
+OK 0 - ֹֻ
+OK 2 - ֹֻ
+OK 0 - .ֹֻ
+OK 1 - .ֹֻ
+OK 2 - .ֹֻ
 OK 0 - ú\Z
 OK 1 - ú\Z
 OK 2 - ú\Z

diff --git a/src/version.c b/src/version.c
index 94d9a1a83a0b44eb76715d6a2eb9a3b4a307b61b..7997e17e0c5254cd672a9d6e619adf251b719f06 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 */
+/**/
+    1021,
 /**/
     1020,
 /**/