|
 |
1fa1ff |
To: vim_dev@googlegroups.com
|
|
|
1fa1ff |
Subject: Patch 7.4.001
|
|
|
1fa1ff |
Fcc: outbox
|
|
|
1fa1ff |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
1fa1ff |
Mime-Version: 1.0
|
|
|
1fa1ff |
Content-Type: text/plain; charset=UTF-8
|
|
|
1fa1ff |
Content-Transfer-Encoding: 8bit
|
|
|
1fa1ff |
------------
|
|
|
1fa1ff |
|
|
|
1fa1ff |
Patch 7.4.001
|
|
|
1fa1ff |
Problem: Character classes such as [a-z] to not react to 'ignorecase'.
|
|
|
1fa1ff |
Breaks man page highlighting. (Mario Grgic)
|
|
|
1fa1ff |
Solution: Add separate items for classes that react to 'ignorecase'. Clean
|
|
|
1fa1ff |
up logic handling character classes. Add more tests.
|
|
|
1fa1ff |
Files: src/regexp_nfa.c, src/testdir/test64.in, src/testdir/test64.ok
|
|
|
1fa1ff |
|
|
|
1fa1ff |
|
|
|
1fa1ff |
*** ../vim-7.4.000/src/regexp_nfa.c 2013-08-01 18:27:51.000000000 +0200
|
|
|
1fa1ff |
--- src/regexp_nfa.c 2013-08-14 11:49:50.000000000 +0200
|
|
|
1fa1ff |
***************
|
|
|
1fa1ff |
*** 29,34 ****
|
|
|
1fa1ff |
--- 29,37 ----
|
|
|
1fa1ff |
# define NFA_REGEXP_DEBUG_LOG "nfa_regexp_debug.log"
|
|
|
1fa1ff |
#endif
|
|
|
1fa1ff |
|
|
|
1fa1ff |
+ /* Added to NFA_ANY - NFA_NUPPER_IC to include a NL. */
|
|
|
1fa1ff |
+ #define NFA_ADD_NL 31
|
|
|
1fa1ff |
+
|
|
|
1fa1ff |
enum
|
|
|
1fa1ff |
{
|
|
|
1fa1ff |
NFA_SPLIT = -1024,
|
|
|
1fa1ff |
***************
|
|
|
1fa1ff |
*** 183,188 ****
|
|
|
1fa1ff |
--- 186,198 ----
|
|
|
1fa1ff |
NFA_NLOWER, /* Match non-lowercase char */
|
|
|
1fa1ff |
NFA_UPPER, /* Match uppercase char */
|
|
|
1fa1ff |
NFA_NUPPER, /* Match non-uppercase char */
|
|
|
1fa1ff |
+ NFA_LOWER_IC, /* Match [a-z] */
|
|
|
1fa1ff |
+ NFA_NLOWER_IC, /* Match [^a-z] */
|
|
|
1fa1ff |
+ NFA_UPPER_IC, /* Match [A-Z] */
|
|
|
1fa1ff |
+ NFA_NUPPER_IC, /* Match [^A-Z] */
|
|
|
1fa1ff |
+
|
|
|
1fa1ff |
+ NFA_FIRST_NL = NFA_ANY + NFA_ADD_NL,
|
|
|
1fa1ff |
+ NFA_LAST_NL = NFA_NUPPER_IC + NFA_ADD_NL,
|
|
|
1fa1ff |
|
|
|
1fa1ff |
NFA_CURSOR, /* Match cursor pos */
|
|
|
1fa1ff |
NFA_LNUM, /* Match line number */
|
|
|
1fa1ff |
***************
|
|
|
1fa1ff |
*** 199,207 ****
|
|
|
1fa1ff |
NFA_MARK_LT, /* Match < mark */
|
|
|
1fa1ff |
NFA_VISUAL, /* Match Visual area */
|
|
|
1fa1ff |
|
|
|
1fa1ff |
- NFA_FIRST_NL = NFA_ANY + ADD_NL,
|
|
|
1fa1ff |
- NFA_LAST_NL = NFA_NUPPER + ADD_NL,
|
|
|
1fa1ff |
-
|
|
|
1fa1ff |
/* Character classes [:alnum:] etc */
|
|
|
1fa1ff |
NFA_CLASS_ALNUM,
|
|
|
1fa1ff |
NFA_CLASS_ALPHA,
|
|
|
1fa1ff |
--- 209,214 ----
|
|
|
1fa1ff |
***************
|
|
|
1fa1ff |
*** 578,583 ****
|
|
|
1fa1ff |
--- 585,592 ----
|
|
|
1fa1ff |
* On failure, return 0 (=FAIL)
|
|
|
1fa1ff |
* Start points to the first char of the range, while end should point
|
|
|
1fa1ff |
* to the closing brace.
|
|
|
1fa1ff |
+ * Keep in mind that 'ignorecase' applies at execution time, thus [a-z] may
|
|
|
1fa1ff |
+ * need to be interpreted as [a-zA-Z].
|
|
|
1fa1ff |
*/
|
|
|
1fa1ff |
static int
|
|
|
1fa1ff |
nfa_recognize_char_class(start, end, extra_newl)
|
|
|
1fa1ff |
***************
|
|
|
1fa1ff |
*** 681,687 ****
|
|
|
1fa1ff |
return FAIL;
|
|
|
1fa1ff |
|
|
|
1fa1ff |
if (newl == TRUE)
|
|
|
1fa1ff |
! extra_newl = ADD_NL;
|
|
|
1fa1ff |
|
|
|
1fa1ff |
switch (config)
|
|
|
1fa1ff |
{
|
|
|
1fa1ff |
--- 690,696 ----
|
|
|
1fa1ff |
return FAIL;
|
|
|
1fa1ff |
|
|
|
1fa1ff |
if (newl == TRUE)
|
|
|
1fa1ff |
! extra_newl = NFA_ADD_NL;
|
|
|
1fa1ff |
|
|
|
1fa1ff |
switch (config)
|
|
|
1fa1ff |
{
|
|
|
1fa1ff |
***************
|
|
|
1fa1ff |
*** 710,722 ****
|
|
|
1fa1ff |
case CLASS_not | CLASS_az | CLASS_AZ:
|
|
|
1fa1ff |
return extra_newl + NFA_NALPHA;
|
|
|
1fa1ff |
case CLASS_az:
|
|
|
1fa1ff |
! return extra_newl + NFA_LOWER;
|
|
|
1fa1ff |
case CLASS_not | CLASS_az:
|
|
|
1fa1ff |
! return extra_newl + NFA_NLOWER;
|
|
|
1fa1ff |
case CLASS_AZ:
|
|
|
1fa1ff |
! return extra_newl + NFA_UPPER;
|
|
|
1fa1ff |
case CLASS_not | CLASS_AZ:
|
|
|
1fa1ff |
! return extra_newl + NFA_NUPPER;
|
|
|
1fa1ff |
}
|
|
|
1fa1ff |
return FAIL;
|
|
|
1fa1ff |
}
|
|
|
1fa1ff |
--- 719,731 ----
|
|
|
1fa1ff |
case CLASS_not | CLASS_az | CLASS_AZ:
|
|
|
1fa1ff |
return extra_newl + NFA_NALPHA;
|
|
|
1fa1ff |
case CLASS_az:
|
|
|
1fa1ff |
! return extra_newl + NFA_LOWER_IC;
|
|
|
1fa1ff |
case CLASS_not | CLASS_az:
|
|
|
1fa1ff |
! return extra_newl + NFA_NLOWER_IC;
|
|
|
1fa1ff |
case CLASS_AZ:
|
|
|
1fa1ff |
! return extra_newl + NFA_UPPER_IC;
|
|
|
1fa1ff |
case CLASS_not | CLASS_AZ:
|
|
|
1fa1ff |
! return extra_newl + NFA_NUPPER_IC;
|
|
|
1fa1ff |
}
|
|
|
1fa1ff |
return FAIL;
|
|
|
1fa1ff |
}
|
|
|
1fa1ff |
***************
|
|
|
1fa1ff |
*** 914,920 ****
|
|
|
1fa1ff |
break;
|
|
|
1fa1ff |
}
|
|
|
1fa1ff |
|
|
|
1fa1ff |
! extra = ADD_NL;
|
|
|
1fa1ff |
|
|
|
1fa1ff |
/* "\_[" is collection plus newline */
|
|
|
1fa1ff |
if (c == '[')
|
|
|
1fa1ff |
--- 923,929 ----
|
|
|
1fa1ff |
break;
|
|
|
1fa1ff |
}
|
|
|
1fa1ff |
|
|
|
1fa1ff |
! extra = NFA_ADD_NL;
|
|
|
1fa1ff |
|
|
|
1fa1ff |
/* "\_[" is collection plus newline */
|
|
|
1fa1ff |
if (c == '[')
|
|
|
1fa1ff |
***************
|
|
|
1fa1ff |
*** 970,976 ****
|
|
|
1fa1ff |
}
|
|
|
1fa1ff |
#endif
|
|
|
1fa1ff |
EMIT(nfa_classcodes[p - classchars]);
|
|
|
1fa1ff |
! if (extra == ADD_NL)
|
|
|
1fa1ff |
{
|
|
|
1fa1ff |
EMIT(NFA_NEWL);
|
|
|
1fa1ff |
EMIT(NFA_OR);
|
|
|
1fa1ff |
--- 979,985 ----
|
|
|
1fa1ff |
}
|
|
|
1fa1ff |
#endif
|
|
|
1fa1ff |
EMIT(nfa_classcodes[p - classchars]);
|
|
|
1fa1ff |
! if (extra == NFA_ADD_NL)
|
|
|
1fa1ff |
{
|
|
|
1fa1ff |
EMIT(NFA_NEWL);
|
|
|
1fa1ff |
EMIT(NFA_OR);
|
|
|
1fa1ff |
***************
|
|
|
1fa1ff |
*** 1240,1260 ****
|
|
|
1fa1ff |
{
|
|
|
1fa1ff |
/*
|
|
|
1fa1ff |
* Try to reverse engineer character classes. For example,
|
|
|
1fa1ff |
! * recognize that [0-9] stands for \d and [A-Za-z_] with \h,
|
|
|
1fa1ff |
* and perform the necessary substitutions in the NFA.
|
|
|
1fa1ff |
*/
|
|
|
1fa1ff |
result = nfa_recognize_char_class(regparse, endp,
|
|
|
1fa1ff |
! extra == ADD_NL);
|
|
|
1fa1ff |
if (result != FAIL)
|
|
|
1fa1ff |
{
|
|
|
1fa1ff |
! if (result >= NFA_DIGIT && result <= NFA_NUPPER)
|
|
|
1fa1ff |
! EMIT(result);
|
|
|
1fa1ff |
! else /* must be char class + newline */
|
|
|
1fa1ff |
{
|
|
|
1fa1ff |
! EMIT(result - ADD_NL);
|
|
|
1fa1ff |
EMIT(NFA_NEWL);
|
|
|
1fa1ff |
EMIT(NFA_OR);
|
|
|
1fa1ff |
}
|
|
|
1fa1ff |
regparse = endp;
|
|
|
1fa1ff |
mb_ptr_adv(regparse);
|
|
|
1fa1ff |
return OK;
|
|
|
1fa1ff |
--- 1249,1269 ----
|
|
|
1fa1ff |
{
|
|
|
1fa1ff |
/*
|
|
|
1fa1ff |
* Try to reverse engineer character classes. For example,
|
|
|
1fa1ff |
! * recognize that [0-9] stands for \d and [A-Za-z_] for \h,
|
|
|
1fa1ff |
* and perform the necessary substitutions in the NFA.
|
|
|
1fa1ff |
*/
|
|
|
1fa1ff |
result = nfa_recognize_char_class(regparse, endp,
|
|
|
1fa1ff |
! extra == NFA_ADD_NL);
|
|
|
1fa1ff |
if (result != FAIL)
|
|
|
1fa1ff |
{
|
|
|
1fa1ff |
! if (result >= NFA_FIRST_NL && result <= NFA_LAST_NL)
|
|
|
1fa1ff |
{
|
|
|
1fa1ff |
! EMIT(result - NFA_ADD_NL);
|
|
|
1fa1ff |
EMIT(NFA_NEWL);
|
|
|
1fa1ff |
EMIT(NFA_OR);
|
|
|
1fa1ff |
}
|
|
|
1fa1ff |
+ else
|
|
|
1fa1ff |
+ EMIT(result);
|
|
|
1fa1ff |
regparse = endp;
|
|
|
1fa1ff |
mb_ptr_adv(regparse);
|
|
|
1fa1ff |
return OK;
|
|
|
1fa1ff |
***************
|
|
|
1fa1ff |
*** 1504,1510 ****
|
|
|
1fa1ff |
* collection, add an OR below. But not for negated
|
|
|
1fa1ff |
* range. */
|
|
|
1fa1ff |
if (!negated)
|
|
|
1fa1ff |
! extra = ADD_NL;
|
|
|
1fa1ff |
}
|
|
|
1fa1ff |
else
|
|
|
1fa1ff |
{
|
|
|
1fa1ff |
--- 1513,1519 ----
|
|
|
1fa1ff |
* collection, add an OR below. But not for negated
|
|
|
1fa1ff |
* range. */
|
|
|
1fa1ff |
if (!negated)
|
|
|
1fa1ff |
! extra = NFA_ADD_NL;
|
|
|
1fa1ff |
}
|
|
|
1fa1ff |
else
|
|
|
1fa1ff |
{
|
|
|
1fa1ff |
***************
|
|
|
1fa1ff |
*** 1537,1543 ****
|
|
|
1fa1ff |
EMIT(NFA_END_COLL);
|
|
|
1fa1ff |
|
|
|
1fa1ff |
/* \_[] also matches \n but it's not negated */
|
|
|
1fa1ff |
! if (extra == ADD_NL)
|
|
|
1fa1ff |
{
|
|
|
1fa1ff |
EMIT(reg_string ? NL : NFA_NEWL);
|
|
|
1fa1ff |
EMIT(NFA_OR);
|
|
|
1fa1ff |
--- 1546,1552 ----
|
|
|
1fa1ff |
EMIT(NFA_END_COLL);
|
|
|
1fa1ff |
|
|
|
1fa1ff |
/* \_[] also matches \n but it's not negated */
|
|
|
1fa1ff |
! if (extra == NFA_ADD_NL)
|
|
|
1fa1ff |
{
|
|
|
1fa1ff |
EMIT(reg_string ? NL : NFA_NEWL);
|
|
|
1fa1ff |
EMIT(NFA_OR);
|
|
|
1fa1ff |
***************
|
|
|
1fa1ff |
*** 2011,2017 ****
|
|
|
1fa1ff |
if (c >= NFA_FIRST_NL && c <= NFA_LAST_NL)
|
|
|
1fa1ff |
{
|
|
|
1fa1ff |
addnl = TRUE;
|
|
|
1fa1ff |
! c -= ADD_NL;
|
|
|
1fa1ff |
}
|
|
|
1fa1ff |
|
|
|
1fa1ff |
STRCPY(code, "");
|
|
|
1fa1ff |
--- 2020,2026 ----
|
|
|
1fa1ff |
if (c >= NFA_FIRST_NL && c <= NFA_LAST_NL)
|
|
|
1fa1ff |
{
|
|
|
1fa1ff |
addnl = TRUE;
|
|
|
1fa1ff |
! c -= NFA_ADD_NL;
|
|
|
1fa1ff |
}
|
|
|
1fa1ff |
|
|
|
1fa1ff |
STRCPY(code, "");
|
|
|
1fa1ff |
***************
|
|
|
1fa1ff |
*** 2217,2222 ****
|
|
|
1fa1ff |
--- 2226,2235 ----
|
|
|
1fa1ff |
case NFA_NLOWER:STRCPY(code, "NFA_NLOWER"); break;
|
|
|
1fa1ff |
case NFA_UPPER: STRCPY(code, "NFA_UPPER"); break;
|
|
|
1fa1ff |
case NFA_NUPPER:STRCPY(code, "NFA_NUPPER"); break;
|
|
|
1fa1ff |
+ case NFA_LOWER_IC: STRCPY(code, "NFA_LOWER_IC"); break;
|
|
|
1fa1ff |
+ case NFA_NLOWER_IC: STRCPY(code, "NFA_NLOWER_IC"); break;
|
|
|
1fa1ff |
+ case NFA_UPPER_IC: STRCPY(code, "NFA_UPPER_IC"); break;
|
|
|
1fa1ff |
+ case NFA_NUPPER_IC: STRCPY(code, "NFA_NUPPER_IC"); break;
|
|
|
1fa1ff |
|
|
|
1fa1ff |
default:
|
|
|
1fa1ff |
STRCPY(code, "CHAR(x)");
|
|
|
1fa1ff |
***************
|
|
|
1fa1ff |
*** 2687,2692 ****
|
|
|
1fa1ff |
--- 2700,2709 ----
|
|
|
1fa1ff |
case NFA_NLOWER:
|
|
|
1fa1ff |
case NFA_UPPER:
|
|
|
1fa1ff |
case NFA_NUPPER:
|
|
|
1fa1ff |
+ case NFA_LOWER_IC:
|
|
|
1fa1ff |
+ case NFA_NLOWER_IC:
|
|
|
1fa1ff |
+ case NFA_UPPER_IC:
|
|
|
1fa1ff |
+ case NFA_NUPPER_IC:
|
|
|
1fa1ff |
/* possibly non-ascii */
|
|
|
1fa1ff |
#ifdef FEAT_MBYTE
|
|
|
1fa1ff |
if (has_mbyte)
|
|
|
1fa1ff |
***************
|
|
|
1fa1ff |
*** 3841,3846 ****
|
|
|
1fa1ff |
--- 3858,3867 ----
|
|
|
1fa1ff |
case NFA_NLOWER:
|
|
|
1fa1ff |
case NFA_UPPER:
|
|
|
1fa1ff |
case NFA_NUPPER:
|
|
|
1fa1ff |
+ case NFA_LOWER_IC:
|
|
|
1fa1ff |
+ case NFA_NLOWER_IC:
|
|
|
1fa1ff |
+ case NFA_UPPER_IC:
|
|
|
1fa1ff |
+ case NFA_NUPPER_IC:
|
|
|
1fa1ff |
case NFA_START_COLL:
|
|
|
1fa1ff |
case NFA_START_NEG_COLL:
|
|
|
1fa1ff |
case NFA_NEWL:
|
|
|
1fa1ff |
***************
|
|
|
1fa1ff |
*** 5872,5877 ****
|
|
|
1fa1ff |
--- 5893,5920 ----
|
|
|
1fa1ff |
ADD_STATE_IF_MATCH(t->state);
|
|
|
1fa1ff |
break;
|
|
|
1fa1ff |
|
|
|
1fa1ff |
+ case NFA_LOWER_IC: /* [a-z] */
|
|
|
1fa1ff |
+ result = ri_lower(curc) || (ireg_ic && ri_upper(curc));
|
|
|
1fa1ff |
+ ADD_STATE_IF_MATCH(t->state);
|
|
|
1fa1ff |
+ break;
|
|
|
1fa1ff |
+
|
|
|
1fa1ff |
+ case NFA_NLOWER_IC: /* [^a-z] */
|
|
|
1fa1ff |
+ result = curc != NUL
|
|
|
1fa1ff |
+ && !(ri_lower(curc) || (ireg_ic && ri_upper(curc)));
|
|
|
1fa1ff |
+ ADD_STATE_IF_MATCH(t->state);
|
|
|
1fa1ff |
+ break;
|
|
|
1fa1ff |
+
|
|
|
1fa1ff |
+ case NFA_UPPER_IC: /* [A-Z] */
|
|
|
1fa1ff |
+ result = ri_upper(curc) || (ireg_ic && ri_lower(curc));
|
|
|
1fa1ff |
+ ADD_STATE_IF_MATCH(t->state);
|
|
|
1fa1ff |
+ break;
|
|
|
1fa1ff |
+
|
|
|
1fa1ff |
+ case NFA_NUPPER_IC: /* ^[A-Z] */
|
|
|
1fa1ff |
+ result = curc != NUL
|
|
|
1fa1ff |
+ && !(ri_upper(curc) || (ireg_ic && ri_lower(curc)));
|
|
|
1fa1ff |
+ ADD_STATE_IF_MATCH(t->state);
|
|
|
1fa1ff |
+ break;
|
|
|
1fa1ff |
+
|
|
|
1fa1ff |
case NFA_BACKREF1:
|
|
|
1fa1ff |
case NFA_BACKREF2:
|
|
|
1fa1ff |
case NFA_BACKREF3:
|
|
|
1fa1ff |
*** ../vim-7.4.000/src/testdir/test64.in 2013-08-01 17:45:33.000000000 +0200
|
|
|
1fa1ff |
--- src/testdir/test64.in 2013-08-14 11:50:11.000000000 +0200
|
|
|
1fa1ff |
***************
|
|
|
1fa1ff |
*** 289,303 ****
|
|
|
1fa1ff |
:call add(tl, [2, '.a\%$', " a\n "])
|
|
|
1fa1ff |
:call add(tl, [2, '.a\%$', " a\n_a", "_a"])
|
|
|
1fa1ff |
:"
|
|
|
1fa1ff |
! :"""" Test recognition of some character classes
|
|
|
1fa1ff |
! :call add(tl, [2, '[0-9]', '8', '8'])
|
|
|
1fa1ff |
! :call add(tl, [2, '[^0-9]', '8'])
|
|
|
1fa1ff |
! :call add(tl, [2, '[0-9a-fA-F]*', '0a7', '0a7'])
|
|
|
1fa1ff |
! :call add(tl, [2, '[^0-9A-Fa-f]\+', '0a7'])
|
|
|
1fa1ff |
! :call add(tl, [2, '[a-z_A-Z0-9]\+', 'aso_sfoij', 'aso_sfoij'])
|
|
|
1fa1ff |
! :call add(tl, [2, '[a-z]', 'a', 'a'])
|
|
|
1fa1ff |
! :call add(tl, [2, '[a-zA-Z]', 'a', 'a'])
|
|
|
1fa1ff |
! :call add(tl, [2, '[A-Z]', 'a'])
|
|
|
1fa1ff |
:call add(tl, [2, '\C[^A-Z]\+', 'ABCOIJDEOIFNSD jsfoij sa', ' jsfoij sa'])
|
|
|
1fa1ff |
:"
|
|
|
1fa1ff |
:"""" Tests for \z features
|
|
|
1fa1ff |
--- 289,317 ----
|
|
|
1fa1ff |
:call add(tl, [2, '.a\%$', " a\n "])
|
|
|
1fa1ff |
:call add(tl, [2, '.a\%$', " a\n_a", "_a"])
|
|
|
1fa1ff |
:"
|
|
|
1fa1ff |
! :"""" Test recognition of character classes
|
|
|
1fa1ff |
! :call add(tl, [2, '[0-7]\+', 'x0123456789x', '01234567'])
|
|
|
1fa1ff |
! :call add(tl, [2, '[^0-7]\+', '0a;X+% 897', 'a;X+% 89'])
|
|
|
1fa1ff |
! :call add(tl, [2, '[0-9]\+', 'x0123456789x', '0123456789'])
|
|
|
1fa1ff |
! :call add(tl, [2, '[^0-9]\+', '0a;X+% 9', 'a;X+% '])
|
|
|
1fa1ff |
! :call add(tl, [2, '[0-9a-fA-F]\+', 'x0189abcdefg', '0189abcdef'])
|
|
|
1fa1ff |
! :call add(tl, [2, '[^0-9A-Fa-f]\+', '0189g;X+% ab', 'g;X+% '])
|
|
|
1fa1ff |
! :call add(tl, [2, '[a-z_A-Z0-9]\+', ';+aso_SfOij ', 'aso_SfOij'])
|
|
|
1fa1ff |
! :call add(tl, [2, '[^a-z_A-Z0-9]\+', 'aSo_;+% sfOij', ';+% '])
|
|
|
1fa1ff |
! :call add(tl, [2, '[a-z_A-Z]\+', '0abyz_ABYZ;', 'abyz_ABYZ'])
|
|
|
1fa1ff |
! :call add(tl, [2, '[^a-z_A-Z]\+', 'abAB_09;+% yzYZ', '09;+% '])
|
|
|
1fa1ff |
! :call add(tl, [2, '[a-z]\+', '0abcxyz1', 'abcxyz'])
|
|
|
1fa1ff |
! :call add(tl, [2, '[a-z]\+', 'AabxyzZ', 'abxyz'])
|
|
|
1fa1ff |
! :call add(tl, [2, '[^a-z]\+', 'a;X09+% x', ';X09+% '])
|
|
|
1fa1ff |
! :call add(tl, [2, '[^a-z]\+', 'abX0;%yz', 'X0;%'])
|
|
|
1fa1ff |
! :call add(tl, [2, '[a-zA-Z]\+', '0abABxzXZ9', 'abABxzXZ'])
|
|
|
1fa1ff |
! :call add(tl, [2, '[^a-zA-Z]\+', 'ab09_;+ XZ', '09_;+ '])
|
|
|
1fa1ff |
! :call add(tl, [2, '[A-Z]\+', 'aABXYZz', 'ABXYZ'])
|
|
|
1fa1ff |
! :call add(tl, [2, '[^A-Z]\+', 'ABx0;%YZ', 'x0;%'])
|
|
|
1fa1ff |
! :call add(tl, [2, '[a-z]\+\c', '0abxyzABXYZ;', 'abxyzABXYZ'])
|
|
|
1fa1ff |
! :call add(tl, [2, '[A-Z]\+\c', '0abABxzXZ9', 'abABxzXZ'])
|
|
|
1fa1ff |
! :call add(tl, [2, '\c[^a-z]\+', 'ab09_;+ XZ', '09_;+ '])
|
|
|
1fa1ff |
! :call add(tl, [2, '\c[^A-Z]\+', 'ab09_;+ XZ', '09_;+ '])
|
|
|
1fa1ff |
:call add(tl, [2, '\C[^A-Z]\+', 'ABCOIJDEOIFNSD jsfoij sa', ' jsfoij sa'])
|
|
|
1fa1ff |
:"
|
|
|
1fa1ff |
:"""" Tests for \z features
|
|
|
1fa1ff |
*** ../vim-7.4.000/src/testdir/test64.ok 2013-08-01 18:28:56.000000000 +0200
|
|
|
1fa1ff |
--- src/testdir/test64.ok 2013-08-14 11:50:37.000000000 +0200
|
|
|
1fa1ff |
***************
|
|
|
1fa1ff |
*** 650,679 ****
|
|
|
1fa1ff |
OK 0 - .a\%$
|
|
|
1fa1ff |
OK 1 - .a\%$
|
|
|
1fa1ff |
OK 2 - .a\%$
|
|
|
1fa1ff |
! OK 0 - [0-9]
|
|
|
1fa1ff |
! OK 1 - [0-9]
|
|
|
1fa1ff |
! OK 2 - [0-9]
|
|
|
1fa1ff |
! OK 0 - [^0-9]
|
|
|
1fa1ff |
! OK 1 - [^0-9]
|
|
|
1fa1ff |
! OK 2 - [^0-9]
|
|
|
1fa1ff |
! OK 0 - [0-9a-fA-F]*
|
|
|
1fa1ff |
! OK 1 - [0-9a-fA-F]*
|
|
|
1fa1ff |
! OK 2 - [0-9a-fA-F]*
|
|
|
1fa1ff |
OK 0 - [^0-9A-Fa-f]\+
|
|
|
1fa1ff |
OK 1 - [^0-9A-Fa-f]\+
|
|
|
1fa1ff |
OK 2 - [^0-9A-Fa-f]\+
|
|
|
1fa1ff |
OK 0 - [a-z_A-Z0-9]\+
|
|
|
1fa1ff |
OK 1 - [a-z_A-Z0-9]\+
|
|
|
1fa1ff |
OK 2 - [a-z_A-Z0-9]\+
|
|
|
1fa1ff |
! OK 0 - [a-z]
|
|
|
1fa1ff |
! OK 1 - [a-z]
|
|
|
1fa1ff |
! OK 2 - [a-z]
|
|
|
1fa1ff |
! OK 0 - [a-zA-Z]
|
|
|
1fa1ff |
! OK 1 - [a-zA-Z]
|
|
|
1fa1ff |
! OK 2 - [a-zA-Z]
|
|
|
1fa1ff |
! OK 0 - [A-Z]
|
|
|
1fa1ff |
! OK 1 - [A-Z]
|
|
|
1fa1ff |
! OK 2 - [A-Z]
|
|
|
1fa1ff |
OK 0 - \C[^A-Z]\+
|
|
|
1fa1ff |
OK 1 - \C[^A-Z]\+
|
|
|
1fa1ff |
OK 2 - \C[^A-Z]\+
|
|
|
1fa1ff |
--- 650,721 ----
|
|
|
1fa1ff |
OK 0 - .a\%$
|
|
|
1fa1ff |
OK 1 - .a\%$
|
|
|
1fa1ff |
OK 2 - .a\%$
|
|
|
1fa1ff |
! OK 0 - [0-7]\+
|
|
|
1fa1ff |
! OK 1 - [0-7]\+
|
|
|
1fa1ff |
! OK 2 - [0-7]\+
|
|
|
1fa1ff |
! OK 0 - [^0-7]\+
|
|
|
1fa1ff |
! OK 1 - [^0-7]\+
|
|
|
1fa1ff |
! OK 2 - [^0-7]\+
|
|
|
1fa1ff |
! OK 0 - [0-9]\+
|
|
|
1fa1ff |
! OK 1 - [0-9]\+
|
|
|
1fa1ff |
! OK 2 - [0-9]\+
|
|
|
1fa1ff |
! OK 0 - [^0-9]\+
|
|
|
1fa1ff |
! OK 1 - [^0-9]\+
|
|
|
1fa1ff |
! OK 2 - [^0-9]\+
|
|
|
1fa1ff |
! OK 0 - [0-9a-fA-F]\+
|
|
|
1fa1ff |
! OK 1 - [0-9a-fA-F]\+
|
|
|
1fa1ff |
! OK 2 - [0-9a-fA-F]\+
|
|
|
1fa1ff |
OK 0 - [^0-9A-Fa-f]\+
|
|
|
1fa1ff |
OK 1 - [^0-9A-Fa-f]\+
|
|
|
1fa1ff |
OK 2 - [^0-9A-Fa-f]\+
|
|
|
1fa1ff |
OK 0 - [a-z_A-Z0-9]\+
|
|
|
1fa1ff |
OK 1 - [a-z_A-Z0-9]\+
|
|
|
1fa1ff |
OK 2 - [a-z_A-Z0-9]\+
|
|
|
1fa1ff |
! OK 0 - [^a-z_A-Z0-9]\+
|
|
|
1fa1ff |
! OK 1 - [^a-z_A-Z0-9]\+
|
|
|
1fa1ff |
! OK 2 - [^a-z_A-Z0-9]\+
|
|
|
1fa1ff |
! OK 0 - [a-z_A-Z]\+
|
|
|
1fa1ff |
! OK 1 - [a-z_A-Z]\+
|
|
|
1fa1ff |
! OK 2 - [a-z_A-Z]\+
|
|
|
1fa1ff |
! OK 0 - [^a-z_A-Z]\+
|
|
|
1fa1ff |
! OK 1 - [^a-z_A-Z]\+
|
|
|
1fa1ff |
! OK 2 - [^a-z_A-Z]\+
|
|
|
1fa1ff |
! OK 0 - [a-z]\+
|
|
|
1fa1ff |
! OK 1 - [a-z]\+
|
|
|
1fa1ff |
! OK 2 - [a-z]\+
|
|
|
1fa1ff |
! OK 0 - [a-z]\+
|
|
|
1fa1ff |
! OK 1 - [a-z]\+
|
|
|
1fa1ff |
! OK 2 - [a-z]\+
|
|
|
1fa1ff |
! OK 0 - [^a-z]\+
|
|
|
1fa1ff |
! OK 1 - [^a-z]\+
|
|
|
1fa1ff |
! OK 2 - [^a-z]\+
|
|
|
1fa1ff |
! OK 0 - [^a-z]\+
|
|
|
1fa1ff |
! OK 1 - [^a-z]\+
|
|
|
1fa1ff |
! OK 2 - [^a-z]\+
|
|
|
1fa1ff |
! OK 0 - [a-zA-Z]\+
|
|
|
1fa1ff |
! OK 1 - [a-zA-Z]\+
|
|
|
1fa1ff |
! OK 2 - [a-zA-Z]\+
|
|
|
1fa1ff |
! OK 0 - [^a-zA-Z]\+
|
|
|
1fa1ff |
! OK 1 - [^a-zA-Z]\+
|
|
|
1fa1ff |
! OK 2 - [^a-zA-Z]\+
|
|
|
1fa1ff |
! OK 0 - [A-Z]\+
|
|
|
1fa1ff |
! OK 1 - [A-Z]\+
|
|
|
1fa1ff |
! OK 2 - [A-Z]\+
|
|
|
1fa1ff |
! OK 0 - [^A-Z]\+
|
|
|
1fa1ff |
! OK 1 - [^A-Z]\+
|
|
|
1fa1ff |
! OK 2 - [^A-Z]\+
|
|
|
1fa1ff |
! OK 0 - [a-z]\+\c
|
|
|
1fa1ff |
! OK 1 - [a-z]\+\c
|
|
|
1fa1ff |
! OK 2 - [a-z]\+\c
|
|
|
1fa1ff |
! OK 0 - [A-Z]\+\c
|
|
|
1fa1ff |
! OK 1 - [A-Z]\+\c
|
|
|
1fa1ff |
! OK 2 - [A-Z]\+\c
|
|
|
1fa1ff |
! OK 0 - \c[^a-z]\+
|
|
|
1fa1ff |
! OK 1 - \c[^a-z]\+
|
|
|
1fa1ff |
! OK 2 - \c[^a-z]\+
|
|
|
1fa1ff |
! OK 0 - \c[^A-Z]\+
|
|
|
1fa1ff |
! OK 1 - \c[^A-Z]\+
|
|
|
1fa1ff |
! OK 2 - \c[^A-Z]\+
|
|
|
1fa1ff |
OK 0 - \C[^A-Z]\+
|
|
|
1fa1ff |
OK 1 - \C[^A-Z]\+
|
|
|
1fa1ff |
OK 2 - \C[^A-Z]\+
|
|
|
1fa1ff |
*** ../vim-7.4.000/src/version.c 2013-08-10 13:29:20.000000000 +0200
|
|
|
1fa1ff |
--- src/version.c 2013-08-14 11:54:57.000000000 +0200
|
|
|
1fa1ff |
***************
|
|
|
1fa1ff |
*** 729,730 ****
|
|
|
1fa1ff |
--- 729,732 ----
|
|
|
1fa1ff |
{ /* Add new patch number below this line */
|
|
|
1fa1ff |
+ /**/
|
|
|
1fa1ff |
+ 1,
|
|
|
1fa1ff |
/**/
|
|
|
1fa1ff |
|
|
|
1fa1ff |
--
|
|
|
1fa1ff |
How many light bulbs does it take to change a person?
|
|
|
1fa1ff |
|
|
|
1fa1ff |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
1fa1ff |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
1fa1ff |
\\\ an exciting new programming language -- http://www.Zimbu.org ///
|
|
|
1fa1ff |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|