[packages/vim/DEVEL: 2/3] replace 7.3.1111 from hg, one from ftp does not apply
glen
glen at pld-linux.org
Mon Jun 17 12:02:23 CEST 2013
commit 621592059b324c406c240a9f477127cb1bc3d010
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Sun Jun 16 22:13:38 2013 +0300
replace 7.3.1111 from hg, one from ftp does not apply
https://code.google.com/p/vim/source/detail?r=43de4ebbe7ad009199987337b864240ba19bfec6
7.3.1111 | 461 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 461 insertions(+)
---
diff --git a/7.3.1111 b/7.3.1111
new file mode 100644
index 0000000..fdb588c
--- /dev/null
+++ b/7.3.1111
@@ -0,0 +1,461 @@
+diff -r 85c04c7963d1 -r 43de4ebbe7ad src/regexp_nfa.c
+--- src/regexp_nfa.c Tue Jun 04 14:23:05 2013 +0200
++++ src/regexp_nfa.c Tue Jun 04 17:47:05 2013 +0200
+@@ -380,38 +380,18 @@
+ char_u *end;
+ int extra_newl;
+ {
+- int i;
+- /* Each of these variables takes up a char in "config[]",
+- * in the order they are here. */
+- int not = FALSE, af = FALSE, AF = FALSE, az = FALSE, AZ = FALSE,
+- o7 = FALSE, o9 = FALSE, underscore = FALSE, newl = FALSE;
++# define CLASS_not 0x80
++# define CLASS_af 0x40
++# define CLASS_AF 0x20
++# define CLASS_az 0x10
++# define CLASS_AZ 0x08
++# define CLASS_o7 0x04
++# define CLASS_o9 0x02
++# define CLASS_underscore 0x01
++
++ int newl = FALSE;
+ char_u *p;
+-#define NCONFIGS 16
+- int classid[NCONFIGS] = {
+- NFA_DIGIT, NFA_NDIGIT, NFA_HEX, NFA_NHEX,
+- NFA_OCTAL, NFA_NOCTAL, NFA_WORD, NFA_NWORD,
+- NFA_HEAD, NFA_NHEAD, NFA_ALPHA, NFA_NALPHA,
+- NFA_LOWER, NFA_NLOWER, NFA_UPPER, NFA_NUPPER
+- };
+- char_u myconfig[10];
+- char_u config[NCONFIGS][9] = {
+- "000000100", /* digit */
+- "100000100", /* non digit */
+- "011000100", /* hex-digit */
+- "111000100", /* non hex-digit */
+- "000001000", /* octal-digit */
+- "100001000", /* [^0-7] */
+- "000110110", /* [0-9A-Za-z_] */
+- "100110110", /* [^0-9A-Za-z_] */
+- "000110010", /* head of word */
+- "100110010", /* not head of word */
+- "000110000", /* alphabetic char a-z */
+- "100110000", /* non alphabetic char */
+- "000100000", /* lowercase letter */
+- "100100000", /* non lowercase */
+- "000010000", /* uppercase */
+- "100010000" /* non uppercase */
+- };
++ int config = 0;
+
+ if (extra_newl == TRUE)
+ newl = TRUE;
+@@ -421,7 +401,7 @@
+ p = start;
+ if (*p == '^')
+ {
+- not = TRUE;
++ config |= CLASS_not;
+ p++;
+ }
+
+@@ -434,37 +414,37 @@
+ case '0':
+ if (*(p + 2) == '9')
+ {
+- o9 = TRUE;
++ config |= CLASS_o9;
+ break;
+ }
+ else
+ if (*(p + 2) == '7')
+ {
+- o7 = TRUE;
++ config |= CLASS_o7;
+ break;
+ }
+ case 'a':
+ if (*(p + 2) == 'z')
+ {
+- az = TRUE;
++ config |= CLASS_az;
+ break;
+ }
+ else
+ if (*(p + 2) == 'f')
+ {
+- af = TRUE;
++ config |= CLASS_af;
+ break;
+ }
+ case 'A':
+ if (*(p + 2) == 'Z')
+ {
+- AZ = TRUE;
++ config |= CLASS_AZ;
+ break;
+ }
+ else
+ if (*(p + 2) == 'F')
+ {
+- AF = TRUE;
++ config |= CLASS_AF;
+ break;
+ }
+ /* FALLTHROUGH */
+@@ -480,7 +460,7 @@
+ }
+ else if (*p == '_')
+ {
+- underscore = TRUE;
++ config |= CLASS_underscore;
+ p ++;
+ }
+ else if (*p == '\n')
+@@ -495,38 +475,45 @@
+ if (p != end)
+ return FAIL;
+
+- /* build the config that represents the ranges we gathered */
+- STRCPY(myconfig, "000000000");
+- if (not == TRUE)
+- myconfig[0] = '1';
+- if (af == TRUE)
+- myconfig[1] = '1';
+- if (AF == TRUE)
+- myconfig[2] = '1';
+- if (az == TRUE)
+- myconfig[3] = '1';
+- if (AZ == TRUE)
+- myconfig[4] = '1';
+- if (o7 == TRUE)
+- myconfig[5] = '1';
+- if (o9 == TRUE)
+- myconfig[6] = '1';
+- if (underscore == TRUE)
+- myconfig[7] = '1';
+ if (newl == TRUE)
++ extra_newl = ADD_NL;
++
++ switch (config)
+ {
+- myconfig[8] = '1';
+- extra_newl = ADD_NL;
++ case CLASS_o9:
++ return extra_newl + NFA_DIGIT;
++ case CLASS_not | CLASS_o9:
++ return extra_newl + NFA_NDIGIT;
++ case CLASS_af | CLASS_AF | CLASS_o9:
++ return extra_newl + NFA_HEX;
++ case CLASS_not | CLASS_af | CLASS_AF | CLASS_o9:
++ return extra_newl + NFA_NHEX;
++ case CLASS_o7:
++ return extra_newl + NFA_OCTAL;
++ case CLASS_not | CLASS_o7:
++ return extra_newl + NFA_NOCTAL;
++ case CLASS_az | CLASS_AZ | CLASS_o9 | CLASS_underscore:
++ return extra_newl + NFA_WORD;
++ case CLASS_not | CLASS_az | CLASS_AZ | CLASS_o9 | CLASS_underscore:
++ return extra_newl + NFA_NWORD;
++ case CLASS_az | CLASS_AZ | CLASS_underscore:
++ return extra_newl + NFA_HEAD;
++ case CLASS_not | CLASS_az | CLASS_AZ | CLASS_underscore:
++ return extra_newl + NFA_NHEAD;
++ case CLASS_az | CLASS_AZ:
++ return extra_newl + NFA_ALPHA;
++ case CLASS_not | CLASS_az | CLASS_AZ:
++ return extra_newl + NFA_NALPHA;
++ case CLASS_az:
++ return extra_newl + NFA_LOWER;
++ case CLASS_not | CLASS_az:
++ return extra_newl + NFA_NLOWER;
++ case CLASS_AZ:
++ return extra_newl + NFA_UPPER;
++ case CLASS_not | CLASS_AZ:
++ return extra_newl + NFA_NUPPER;
+ }
+- /* try to recognize character classes */
+- for (i = 0; i < NCONFIGS; i++)
+- if (STRNCMP(myconfig, config[i], 8) == 0)
+- return classid[i] + extra_newl;
+-
+- /* fallthrough => no success so far */
+ return FAIL;
+-
+-#undef NCONFIGS
+ }
+
+ /*
+@@ -900,7 +887,7 @@
+ EMSG_RET_FAIL(_(e_z1_not_allowed));
+ EMIT(NFA_ZREF1 + (no_Magic(c) - '1'));
+ /* No need to set nfa_has_backref, the sub-matches don't
+- * change when \z1 .. \z9 maches or not. */
++ * change when \z1 .. \z9 matches or not. */
+ re_has_z = REX_USE;
+ break;
+ case '(':
+@@ -4658,7 +4645,7 @@
+ }
+ else
+ {
+- /* skip ofer the matched characters, set character
++ /* skip over the matched characters, set character
+ * count in NFA_SKIP */
+ ll = nextlist;
+ add_state = t->state->out;
+diff -r 85c04c7963d1 -r 43de4ebbe7ad src/testdir/test36.in
+--- src/testdir/test36.in Tue Jun 04 14:23:05 2013 +0200
++++ src/testdir/test36.in Tue Jun 04 17:47:05 2013 +0200
+@@ -1,40 +1,105 @@
+-Test character classes in regexp
++Test character classes in regexp using regexpengine 0, 1, 2.
+
+ STARTTEST
+-/^start-here
+-j:s/\d//g
+-j:s/\D//g
+-j:s/\o//g
+-j:s/\O//g
+-j:s/\x//g
+-j:s/\X//g
+-j:s/\w//g
+-j:s/\W//g
+-j:s/\h//g
+-j:s/\H//g
+-j:s/\a//g
+-j:s/\A//g
+-j:s/\l//g
+-j:s/\L//g
+-j:s/\u//g
+-j:s/\U//g
++/^start-here/+1
++Y:s/\%#=0\d//g
++p:s/\%#=1\d//g
++p:s/\%#=2\d//g
++p:s/\%#=0[0-9]//g
++p:s/\%#=1[0-9]//g
++p:s/\%#=2[0-9]//g
++p:s/\%#=0\D//g
++p:s/\%#=1\D//g
++p:s/\%#=2\D//g
++p:s/\%#=0[^0-9]//g
++p:s/\%#=1[^0-9]//g
++p:s/\%#=2[^0-9]//g
++p:s/\%#=0\o//g
++p:s/\%#=1\o//g
++p:s/\%#=2\o//g
++p:s/\%#=0[0-7]//g
++p:s/\%#=1[0-7]//g
++p:s/\%#=2[0-7]//g
++p:s/\%#=0\O//g
++p:s/\%#=1\O//g
++p:s/\%#=2\O//g
++p:s/\%#=0[^0-7]//g
++p:s/\%#=1[^0-7]//g
++p:s/\%#=2[^0-7]//g
++p:s/\%#=0\x//g
++p:s/\%#=1\x//g
++p:s/\%#=2\x//g
++p:s/\%#=0[0-9A-Fa-f]//g
++p:s/\%#=1[0-9A-Fa-f]//g
++p:s/\%#=2[0-9A-Fa-f]//g
++p:s/\%#=0\X//g
++p:s/\%#=1\X//g
++p:s/\%#=2\X//g
++p:s/\%#=0[^0-9A-Fa-f]//g
++p:s/\%#=1[^0-9A-Fa-f]//g
++p:s/\%#=2[^0-9A-Fa-f]//g
++p:s/\%#=0\w//g
++p:s/\%#=1\w//g
++p:s/\%#=2\w//g
++p:s/\%#=0[0-9A-Za-z_]//g
++p:s/\%#=1[0-9A-Za-z_]//g
++p:s/\%#=2[0-9A-Za-z_]//g
++p:s/\%#=0\W//g
++p:s/\%#=1\W//g
++p:s/\%#=2\W//g
++p:s/\%#=0[^0-9A-Za-z_]//g
++p:s/\%#=1[^0-9A-Za-z_]//g
++p:s/\%#=2[^0-9A-Za-z_]//g
++p:s/\%#=0\h//g
++p:s/\%#=1\h//g
++p:s/\%#=2\h//g
++p:s/\%#=0[A-Za-z_]//g
++p:s/\%#=1[A-Za-z_]//g
++p:s/\%#=2[A-Za-z_]//g
++p:s/\%#=0\H//g
++p:s/\%#=1\H//g
++p:s/\%#=2\H//g
++p:s/\%#=0[^A-Za-z_]//g
++p:s/\%#=1[^A-Za-z_]//g
++p:s/\%#=2[^A-Za-z_]//g
++p:s/\%#=0\a//g
++p:s/\%#=1\a//g
++p:s/\%#=2\a//g
++p:s/\%#=0[A-Za-z]//g
++p:s/\%#=1[A-Za-z]//g
++p:s/\%#=2[A-Za-z]//g
++p:s/\%#=0\A//g
++p:s/\%#=1\A//g
++p:s/\%#=2\A//g
++p:s/\%#=0[^A-Za-z]//g
++p:s/\%#=1[^A-Za-z]//g
++p:s/\%#=2[^A-Za-z]//g
++p:s/\%#=0\l//g
++p:s/\%#=1\l//g
++p:s/\%#=2\l//g
++p:s/\%#=0[a-z]//g
++p:s/\%#=1[a-z]//g
++p:s/\%#=2[a-z]//g
++p:s/\%#=0\L//g
++p:s/\%#=1\L//g
++p:s/\%#=2\L//g
++p:s/\%#=0[^a-z]//g
++p:s/\%#=1[^a-z]//g
++p:s/\%#=2[^a-z]//g
++p:s/\%#=0\u//g
++p:s/\%#=1\u//g
++p:s/\%#=2\u//g
++p:s/\%#=0[A-Z]//g
++p:s/\%#=1[A-Z]//g
++p:s/\%#=2[A-Z]//g
++p:s/\%#=0\U//g
++p:s/\%#=1\U//g
++p:s/\%#=2\U//g
++p:s/\%#=0[^A-Z]//g
++p:s/\%#=1[^A-Z]//g
++p:s/\%#=2[^A-Z]//g
+ :/^start-here/+1,$wq! test.out
+ ENDTEST
+
+ start-here
+
!"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~����������
+-
!"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~����������
+-
!"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~����������
+-
!"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~����������
+-
!"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~����������
+-
!"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~����������
+-
!"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~����������
+-
!"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~����������
+-
!"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~����������
+-
!"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~����������
+-
!"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~����������
+-
!"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~����������
+-
!"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~����������
+-
!"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~����������
+-
!"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~����������
+-
!"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~����������
+diff -r 85c04c7963d1 -r 43de4ebbe7ad src/testdir/test36.ok
+--- src/testdir/test36.ok Tue Jun 04 14:23:05 2013 +0200
++++ src/testdir/test36.ok Tue Jun 04 17:47:05 2013 +0200
+@@ -1,16 +1,96 @@
++
!"#$%&'()#+'-./:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~����������
++
!"#$%&'()#+'-./:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~����������
++
!"#$%&'()#+'-./:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~����������
++
!"#$%&'()#+'-./:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~����������
++
!"#$%&'()#+'-./:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~����������
+
!"#$%&'()#+'-./:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~����������
+ 0123456789
++0123456789
++0123456789
++0123456789
++0123456789
++0123456789
++
!"#$%&'()#+'-./89:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~����������
++
!"#$%&'()#+'-./89:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~����������
++
!"#$%&'()#+'-./89:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~����������
++
!"#$%&'()#+'-./89:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~����������
++
!"#$%&'()#+'-./89:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~����������
+
!"#$%&'()#+'-./89:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~����������
+ 01234567
++01234567
++01234567
++01234567
++01234567
++01234567
++
!"#$%&'()#+'-./:;<=>?@GHIXYZ[\]^_`ghiwxyz{|}~����������
++
!"#$%&'()#+'-./:;<=>?@GHIXYZ[\]^_`ghiwxyz{|}~����������
++
!"#$%&'()#+'-./:;<=>?@GHIXYZ[\]^_`ghiwxyz{|}~����������
++
!"#$%&'()#+'-./:;<=>?@GHIXYZ[\]^_`ghiwxyz{|}~����������
++
!"#$%&'()#+'-./:;<=>?@GHIXYZ[\]^_`ghiwxyz{|}~����������
+
!"#$%&'()#+'-./:;<=>?@GHIXYZ[\]^_`ghiwxyz{|}~����������
+ 0123456789ABCDEFabcdef
++0123456789ABCDEFabcdef
++0123456789ABCDEFabcdef
++0123456789ABCDEFabcdef
++0123456789ABCDEFabcdef
++0123456789ABCDEFabcdef
++
!"#$%&'()#+'-./:;<=>?@[\]^`{|}~����������
++
!"#$%&'()#+'-./:;<=>?@[\]^`{|}~����������
++
!"#$%&'()#+'-./:;<=>?@[\]^`{|}~����������
++
!"#$%&'()#+'-./:;<=>?@[\]^`{|}~����������
++
!"#$%&'()#+'-./:;<=>?@[\]^`{|}~����������
+
!"#$%&'()#+'-./:;<=>?@[\]^`{|}~����������
+ 0123456789ABCDEFGHIXYZ_abcdefghiwxyz
++0123456789ABCDEFGHIXYZ_abcdefghiwxyz
++0123456789ABCDEFGHIXYZ_abcdefghiwxyz
++0123456789ABCDEFGHIXYZ_abcdefghiwxyz
++0123456789ABCDEFGHIXYZ_abcdefghiwxyz
++0123456789ABCDEFGHIXYZ_abcdefghiwxyz
++
!"#$%&'()#+'-./0123456789:;<=>?@[\]^`{|}~����������
++
!"#$%&'()#+'-./0123456789:;<=>?@[\]^`{|}~����������
++
!"#$%&'()#+'-./0123456789:;<=>?@[\]^`{|}~����������
++
!"#$%&'()#+'-./0123456789:;<=>?@[\]^`{|}~����������
++
!"#$%&'()#+'-./0123456789:;<=>?@[\]^`{|}~����������
+
!"#$%&'()#+'-./0123456789:;<=>?@[\]^`{|}~����������
+ ABCDEFGHIXYZ_abcdefghiwxyz
++ABCDEFGHIXYZ_abcdefghiwxyz
++ABCDEFGHIXYZ_abcdefghiwxyz
++ABCDEFGHIXYZ_abcdefghiwxyz
++ABCDEFGHIXYZ_abcdefghiwxyz
++ABCDEFGHIXYZ_abcdefghiwxyz
++
!"#$%&'()#+'-./0123456789:;<=>?@[\]^_`{|}~����������
++
!"#$%&'()#+'-./0123456789:;<=>?@[\]^_`{|}~����������
++
!"#$%&'()#+'-./0123456789:;<=>?@[\]^_`{|}~����������
++
!"#$%&'()#+'-./0123456789:;<=>?@[\]^_`{|}~����������
++
!"#$%&'()#+'-./0123456789:;<=>?@[\]^_`{|}~����������
+
!"#$%&'()#+'-./0123456789:;<=>?@[\]^_`{|}~����������
+ ABCDEFGHIXYZabcdefghiwxyz
++ABCDEFGHIXYZabcdefghiwxyz
++ABCDEFGHIXYZabcdefghiwxyz
++ABCDEFGHIXYZabcdefghiwxyz
++ABCDEFGHIXYZabcdefghiwxyz
++ABCDEFGHIXYZabcdefghiwxyz
++
!"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`{|}~����������
++
!"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`{|}~����������
++
!"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`{|}~����������
++
!"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`{|}~����������
++
!"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`{|}~����������
+
!"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`{|}~����������
+ abcdefghiwxyz
++abcdefghiwxyz
++abcdefghiwxyz
++abcdefghiwxyz
++abcdefghiwxyz
++abcdefghiwxyz
++
!"#$%&'()#+'-./0123456789:;<=>?@[\]^_`abcdefghiwxyz{|}~����������
++
!"#$%&'()#+'-./0123456789:;<=>?@[\]^_`abcdefghiwxyz{|}~����������
++
!"#$%&'()#+'-./0123456789:;<=>?@[\]^_`abcdefghiwxyz{|}~����������
++
!"#$%&'()#+'-./0123456789:;<=>?@[\]^_`abcdefghiwxyz{|}~����������
++
!"#$%&'()#+'-./0123456789:;<=>?@[\]^_`abcdefghiwxyz{|}~����������
+
!"#$%&'()#+'-./0123456789:;<=>?@[\]^_`abcdefghiwxyz{|}~����������
+ ABCDEFGHIXYZ
++ABCDEFGHIXYZ
++ABCDEFGHIXYZ
++ABCDEFGHIXYZ
++ABCDEFGHIXYZ
++ABCDEFGHIXYZ
+diff -r 85c04c7963d1 -r 43de4ebbe7ad src/version.c
+--- src/version.c Tue Jun 04 14:23:05 2013 +0200
++++ src/version.c Tue Jun 04 17:47:05 2013 +0200
+@@ -729,6 +729,8 @@
+ static int included_patches[] =
+ { /* Add new patch number below this line */
+ /**/
++ 1111,
++/**/
+ 1110,
+ /**/
+ 1109,
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/vim.git/commitdiff/a9c8a268653da4b0b0e553a7f97b57d777ddf4ee
More information about the pld-cvs-commit
mailing list