diff options
| author | Michael Ennen <mike.ennen@gmail.com> | 2016-12-21 16:08:51 -0700 |
|---|---|---|
| committer | Michael Ennen <mike.ennen@gmail.com> | 2016-12-31 14:38:27 -0700 |
| commit | e8ccaa7a527f93ba8e40e4b15baaab71bea85b4c (patch) | |
| tree | 222c37df6b7a39d7fc32dd32a281336e58ed8de0 /src/nvim/regexp.c | |
| parent | 415495273c1c53dbc28fae55b08f9672bc5414b0 (diff) | |
| download | rneovim-e8ccaa7a527f93ba8e40e4b15baaab71bea85b4c.tar.gz rneovim-e8ccaa7a527f93ba8e40e4b15baaab71bea85b4c.tar.bz2 rneovim-e8ccaa7a527f93ba8e40e4b15baaab71bea85b4c.zip | |
vim-patch:7.4.1783
Problem: The old regexp engine doesn't handle character classes correctly.
(Manuel Ortega)
Solution: Use regmbc() instead of regc(). Add a test.
https://github.com/vim/vim/commit/af98a49dd0ef1661b4998f118151fddbf6e4df75
Diffstat (limited to 'src/nvim/regexp.c')
| -rw-r--r-- | src/nvim/regexp.c | 56 |
1 files changed, 34 insertions, 22 deletions
diff --git a/src/nvim/regexp.c b/src/nvim/regexp.c index 122b589d2f..6613d284d7 100644 --- a/src/nvim/regexp.c +++ b/src/nvim/regexp.c @@ -2311,14 +2311,14 @@ collection: case CLASS_ALNUM: for (cu = 1; cu < 128; cu++) { if (isalnum(cu)) { - regc(cu); + regmbc(cu); } } break; case CLASS_ALPHA: for (cu = 1; cu < 128; cu++) { if (isalpha(cu)) { - regc(cu); + regmbc(cu); } } break; @@ -2327,36 +2327,44 @@ collection: regc('\t'); break; case CLASS_CNTRL: - for (cu = 1; cu <= 255; cu++) - if (iscntrl(cu)) - regc(cu); + for (cu = 1; cu <= 255; cu++) { + if (iscntrl(cu)) { + regmbc(cu); + } + } break; case CLASS_DIGIT: - for (cu = 1; cu <= 255; cu++) - if (ascii_isdigit(cu)) - regc(cu); + for (cu = 1; cu <= 255; cu++) { + if (ascii_isdigit(cu)) { + regmbc(cu); + } + } break; case CLASS_GRAPH: - for (cu = 1; cu <= 255; cu++) - if (isgraph(cu)) - regc(cu); + for (cu = 1; cu <= 255; cu++) { + if (isgraph(cu)) { + regmbc(cu); + } + } break; case CLASS_LOWER: for (cu = 1; cu <= 255; cu++) { if (vim_islower(cu) && cu != 170 && cu != 186) { - regc(cu); + regmbc(cu); } } break; case CLASS_PRINT: - for (cu = 1; cu <= 255; cu++) - if (vim_isprintc(cu)) - regc(cu); + for (cu = 1; cu <= 255; cu++) { + if (vim_isprintc(cu)) { + regmbc(cu); + } + } break; case CLASS_PUNCT: for (cu = 1; cu < 128; cu++) { if (ispunct(cu)) { - regc(cu); + regmbc(cu); } } break; @@ -2366,14 +2374,18 @@ collection: regc(' '); break; case CLASS_UPPER: - for (cu = 1; cu <= 255; cu++) - if (vim_isupper(cu)) - regc(cu); + for (cu = 1; cu <= 255; cu++) { + if (vim_isupper(cu)) { + regmbc(cu); + } + } break; case CLASS_XDIGIT: - for (cu = 1; cu <= 255; cu++) - if (ascii_isxdigit(cu)) - regc(cu); + for (cu = 1; cu <= 255; cu++) { + if (ascii_isxdigit(cu)) { + regmbc(cu); + } + } break; case CLASS_TAB: regc('\t'); |