aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00
Code Activity

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)
This commit is contained in:
Bram Moolenaar
2016-04-26 21:39:13 +02:00
parent ab3022196e
commit e8aee7dcf9
3 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/regexp.c
View File

@@ -2542,12 +2542,12 @@ 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))
regmbc(cu); regmbc(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))
regmbc(cu); regmbc(cu);
break; break;
@@ -2572,7 +2572,8 @@ collection:
break; break;
case CLASS_LOWER: case CLASS_LOWER:
for (cu = 1; cu <= 255; cu++) for (cu = 1; cu <= 255; cu++)
if (MB_ISLOWER(cu)) if (MB_ISLOWER(cu) && cu != 170
&& cu != 186)
regmbc(cu); regmbc(cu);
break; break;
case CLASS_PRINT: case CLASS_PRINT:
@@ -2581,7 +2582,7 @@ collection:
regmbc(cu); regmbc(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))
regmbc(cu); regmbc(cu);
break; break;

8
src/regexp_nfa.c
View File

@@ -4837,11 +4837,11 @@ 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:
@@ -4861,7 +4861,7 @@ check_char_class(int class, int c)
return OK; return OK;
break; break;
case NFA_CLASS_LOWER: case NFA_CLASS_LOWER:
if (MB_ISLOWER(c)) if (MB_ISLOWER(c) && c != 170 && c != 186)
return OK; return OK;
break; break;
case NFA_CLASS_PRINT: case NFA_CLASS_PRINT:
@@ -4869,7 +4869,7 @@ check_char_class(int class, int 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:

2
src/version.c
View File

@@ -753,6 +753,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 */
/**/
1793,
/**/ /**/
1792, 1792,
/**/ /**/