diff options
| author | Felipe Oliveira Carvalho <felipekde@gmail.com> | 2015-04-25 13:34:30 -0300 |
|---|---|---|
| committer | Felipe Oliveira Carvalho <felipekde@gmail.com> | 2015-04-25 13:37:44 -0300 |
| commit | 0bce4dc54427d05ab320a88f6269a9c1b05ea899 (patch) | |
| tree | 4a3aff2749eb0b70b7947ecfc7cd56d56ad4e29d /src/nvim/regexp_nfa.c | |
| parent | d350d12a00518aa0d9e3a1d49c6815c3398d882f (diff) | |
| parent | c96b933acc4d9ec7382d451055e44c85959772b9 (diff) | |
| download | rneovim-0bce4dc54427d05ab320a88f6269a9c1b05ea899.tar.gz rneovim-0bce4dc54427d05ab320a88f6269a9c1b05ea899.tar.bz2 rneovim-0bce4dc54427d05ab320a88f6269a9c1b05ea899.zip | |
Merge #2486: Replacements for vim_iswhite, VIM_ISDIGIT, vim_isdigit, vim_isxdigit, and vim_isspace
Reviewed-by: Michael Reed <m.reed@mykolab.com>
Diffstat (limited to 'src/nvim/regexp_nfa.c')
| -rw-r--r-- | src/nvim/regexp_nfa.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/nvim/regexp_nfa.c b/src/nvim/regexp_nfa.c index 56e488fbd4..3daf6a8544 100644 --- a/src/nvim/regexp_nfa.c +++ b/src/nvim/regexp_nfa.c @@ -1401,7 +1401,7 @@ static int nfa_regatom(void) if (c == '<' || c == '>') c = getchr(); - while (VIM_ISDIGIT(c)) { + while (ascii_isdigit(c)) { n = n * 10 + (c - '0'); c = getchr(); } @@ -4235,7 +4235,7 @@ static int check_char_class(int class, int c) return OK; break; case NFA_CLASS_DIGIT: - if (VIM_ISDIGIT(c)) + if (ascii_isdigit(c)) return OK; break; case NFA_CLASS_GRAPH: @@ -4263,7 +4263,7 @@ static int check_char_class(int class, int c) return OK; break; case NFA_CLASS_XDIGIT: - if (vim_isxdigit(c)) + if (ascii_isxdigit(c)) return OK; break; case NFA_CLASS_TAB: @@ -5488,7 +5488,7 @@ static int nfa_regmatch(nfa_regprog_T *prog, nfa_state_T *start, regsubs_T *subm break; case NFA_SIDENT: /* \I */ - result = !VIM_ISDIGIT(curc) && vim_isIDc(curc); + result = !ascii_isdigit(curc) && vim_isIDc(curc); ADD_STATE_IF_MATCH(t->state); break; @@ -5498,7 +5498,7 @@ static int nfa_regmatch(nfa_regprog_T *prog, nfa_state_T *start, regsubs_T *subm break; case NFA_SKWORD: /* \K */ - result = !VIM_ISDIGIT(curc) + result = !ascii_isdigit(curc) && vim_iswordp_buf(reginput, reg_buf); ADD_STATE_IF_MATCH(t->state); break; @@ -5509,7 +5509,7 @@ static int nfa_regmatch(nfa_regprog_T *prog, nfa_state_T *start, regsubs_T *subm break; case NFA_SFNAME: /* \F */ - result = !VIM_ISDIGIT(curc) && vim_isfilec(curc); + result = !ascii_isdigit(curc) && vim_isfilec(curc); ADD_STATE_IF_MATCH(t->state); break; @@ -5519,17 +5519,17 @@ static int nfa_regmatch(nfa_regprog_T *prog, nfa_state_T *start, regsubs_T *subm break; case NFA_SPRINT: /* \P */ - result = !VIM_ISDIGIT(curc) && vim_isprintc(PTR2CHAR(reginput)); + result = !ascii_isdigit(curc) && vim_isprintc(PTR2CHAR(reginput)); ADD_STATE_IF_MATCH(t->state); break; case NFA_WHITE: /* \s */ - result = vim_iswhite(curc); + result = ascii_iswhite(curc); ADD_STATE_IF_MATCH(t->state); break; case NFA_NWHITE: /* \S */ - result = curc != NUL && !vim_iswhite(curc); + result = curc != NUL && !ascii_iswhite(curc); ADD_STATE_IF_MATCH(t->state); break; |