aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-25 10:54:51 -04:00
Code

updated for version 7.4.294

Browse Source 
Problem:    Test files missing from patch.
Solution:   Patch the test files.
This commit is contained in:
Bram Moolenaar 2014-05-13 20:15:37 +02:00
parent 8df5acfda9
commit caca646bf0
3 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/testdir/test95.in
View File

@ -51,7 +51,11 @@ STARTTEST
:call add(tl, [1, "\u05b9\u05bb", " y\u05b9 x\u05b9\u05bb ", "x\u05b9\u05bb"]) :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"]) :call add(tl, [2, ".\u05b9\u05bb", " y\u05bb x\u05b9\u05bb ", "x\u05b9\u05bb"])
:call add(tl, [2, "a", "ca\u0300t"]) :call add(tl, [2, "a", "ca\u0300t"])
:call add(tl, [2, "ca", "ca\u0300t"])
:call add(tl, [2, "a\u0300", "ca\u0300t", "a\u0300"]) :call add(tl, [2, "a\u0300", "ca\u0300t", "a\u0300"])
:call add(tl, [2, 'a\%C', "ca\u0300t", "a\u0300"])
:call add(tl, [2, 'ca\%C', "ca\u0300t", "ca\u0300"])
:call add(tl, [2, 'ca\%Ct', "ca\u0300t", "ca\u0300t"])
:"""" Test \Z :"""" Test \Z
@ -91,15 +95,15 @@ STARTTEST
: try : try
: let l = matchlist(text, pat) : let l = matchlist(text, pat)
: catch : catch
: $put ='ERROR: pat: \"' . pat . '\", text: \"' . text . '\", caused an exception: \"' . v:exception . '\"' : $put ='ERROR ' . engine . ': pat: \"' . pat . '\", text: \"' . text . '\", caused an exception: \"' . v:exception . '\"'
: endtry : endtry
:" check the match itself :" check the match itself
: if len(l) == 0 && len(t) > matchidx : if len(l) == 0 && len(t) > matchidx
: $put ='ERROR: pat: \"' . pat . '\", text: \"' . text . '\", did not match, expected: \"' . t[matchidx] . '\"' : $put ='ERROR ' . engine . ': pat: \"' . pat . '\", text: \"' . text . '\", did not match, expected: \"' . t[matchidx] . '\"'
: elseif len(l) > 0 && len(t) == matchidx : elseif len(l) > 0 && len(t) == matchidx
: $put ='ERROR: pat: \"' . pat . '\", text: \"' . text . '\", match: \"' . l[0] . '\", expected no match' : $put ='ERROR ' . engine . ': pat: \"' . pat . '\", text: \"' . text . '\", match: \"' . l[0] . '\", expected no match'
: elseif len(t) > matchidx && l[0] != t[matchidx] : elseif len(t) > matchidx && l[0] != t[matchidx]
: $put ='ERROR: pat: \"' . pat . '\", text: \"' . text . '\", match: \"' . l[0] . '\", expected: \"' . t[matchidx] . '\"' : $put ='ERROR ' . engine . ': pat: \"' . pat . '\", text: \"' . text . '\", match: \"' . l[0] . '\", expected: \"' . t[matchidx] . '\"'
: else : else
: $put ='OK ' . engine . ' - ' . pat : $put ='OK ' . engine . ' - ' . pat
: endif : endif
@ -112,7 +116,7 @@ STARTTEST
: let e = t[matchidx + i] : let e = t[matchidx + i]
: endif : endif
: if l[i] != e : if l[i] != e
: $put ='ERROR: pat: \"' . pat . '\", text: \"' . text . '\", submatch ' . i . ': \"' . l[i] . '\", expected: \"' . e . '\"' : $put ='ERROR ' . engine . ': pat: \"' . pat . '\", text: \"' . text . '\", submatch ' . i . ': \"' . l[i] . '\", expected: \"' . e . '\"'
: endif : endif
: endfor : endfor
: unlet i : unlet i

12
src/testdir/test95.ok
View File

@ -70,9 +70,21 @@ OK 2 - .ֹֻ
OK 0 - a OK 0 - a
OK 1 - a OK 1 - a
OK 2 - a OK 2 - a
OK 0 - ca
OK 1 - ca
OK 2 - ca
OK 0 - à OK 0 - à
OK 1 - à OK 1 - à
OK 2 - à OK 2 - à
OK 0 - a\%C
OK 1 - a\%C
OK 2 - a\%C
OK 0 - ca\%C
OK 1 - ca\%C
OK 2 - ca\%C
OK 0 - ca\%Ct
OK 1 - ca\%Ct
OK 2 - ca\%Ct
OK 0 - ú\Z OK 0 - ú\Z
OK 1 - ú\Z OK 1 - ú\Z
OK 2 - ú\Z OK 2 - ú\Z

2
src/version.c
View File

@ -734,6 +734,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 */
/**/
294,
/**/ /**/
293, 293,
/**/ /**/