IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:7.4.1793

Browse Source 
Problem:    Some character classes may differ between systems.  On OS/X the
            regexp test fails.
Solution:   Make this less dependent on the system. (idea by Kazunobu Kuriyama)

e8aee7dcf9
This commit is contained in:
Michael Ennen 2016-12-21 01:57:59 -07:00
parent 5366242789
commit 415495273c
3 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/nvim/regexp.c
View File

@ -2309,14 +2309,18 @@ collection:
} }
break; break;
case CLASS_ALNUM: case CLASS_ALNUM:
for (cu = 1; cu <= 255; cu++) for (cu = 1; cu < 128; cu++) {
if (isalnum(cu)) if (isalnum(cu)) {
regc(cu); regc(cu);
}
}
break; break;
case CLASS_ALPHA: case CLASS_ALPHA:
for (cu = 1; cu <= 255; cu++) for (cu = 1; cu < 128; cu++) {
if (isalpha(cu)) if (isalpha(cu)) {
regc(cu); regc(cu);
}
}
break; break;
case CLASS_BLANK: case CLASS_BLANK:
regc(' '); regc(' ');
@ -2338,9 +2342,11 @@ collection:
regc(cu); regc(cu);
break; break;
case CLASS_LOWER: case CLASS_LOWER:
for (cu = 1; cu <= 255; cu++) for (cu = 1; cu <= 255; cu++) {
if (vim_islower(cu)) if (vim_islower(cu) && cu != 170 && cu != 186) {
regc(cu); regc(cu);
}
}
break; break;
case CLASS_PRINT: case CLASS_PRINT:
for (cu = 1; cu <= 255; cu++) for (cu = 1; cu <= 255; cu++)
@ -2348,9 +2354,11 @@ collection:
regc(cu); regc(cu);
break; break;
case CLASS_PUNCT: case CLASS_PUNCT:
for (cu = 1; cu <= 255; cu++) for (cu = 1; cu < 128; cu++) {
if (ispunct(cu)) if (ispunct(cu)) {
regc(cu); regc(cu);
}
}
break; break;
case CLASS_SPACE: case CLASS_SPACE:
for (cu = 9; cu <= 13; cu++) for (cu = 9; cu <= 13; cu++)

12
src/nvim/regexp_nfa.c
View File

@ -4320,12 +4320,14 @@ static int check_char_class(int class, int c)
{ {
switch (class) { switch (class) {
case NFA_CLASS_ALNUM: case NFA_CLASS_ALNUM:
if (c >= 1 && c <= 255 && isalnum(c)) if (c >= 1 && c < 128 && isalnum(c)) {
return OK; return OK;
}
break; break;
case NFA_CLASS_ALPHA: case NFA_CLASS_ALPHA:
if (c >= 1 && c <= 255 && isalpha(c)) if (c >= 1 && c < 128 && isalpha(c)) {
return OK; return OK;
}
break; break;
case NFA_CLASS_BLANK: case NFA_CLASS_BLANK:
if (c == ' ' || c == '\t') if (c == ' ' || c == '\t')
@ -4344,16 +4346,18 @@ static int check_char_class(int class, int c)
return OK; return OK;
break; break;
case NFA_CLASS_LOWER: case NFA_CLASS_LOWER:
if (vim_islower(c)) if (vim_islower(c) && c != 170 && c != 186) {
return OK; return OK;
}
break; break;
case NFA_CLASS_PRINT: case NFA_CLASS_PRINT:
if (vim_isprintc(c)) if (vim_isprintc(c))
return OK; return OK;
break; break;
case NFA_CLASS_PUNCT: case NFA_CLASS_PUNCT:
if (c >= 1 && c <= 255 && ispunct(c)) if (c >= 1 && c < 128 && ispunct(c)) {
return OK; return OK;
}
break; break;
case NFA_CLASS_SPACE: case NFA_CLASS_SPACE:
if ((c >= 9 && c <= 13) || (c == ' ')) if ((c >= 9 && c <= 13) || (c == ' '))

2
src/nvim/version.c
View File

@ -646,7 +646,7 @@ static int included_patches[] = {
// 1796 NA // 1796 NA
// 1795 NA // 1795 NA
// 1794 NA // 1794 NA
// 1793, 1793,
// 1792 NA // 1792 NA
// 1791 NA // 1791 NA
// 1790 NA // 1790 NA