From 93bf201119f68b0723ee3f240afa48134cc41399 Mon Sep 17 00:00:00 2001 From: Felipe Oliveira Carvalho Date: Wed, 22 Apr 2015 19:12:26 -0300 Subject: Replace vim_iswhite with ascii_iswhite() defined in ascii.h --- src/nvim/regexp_nfa.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/nvim/regexp_nfa.c') diff --git a/src/nvim/regexp_nfa.c b/src/nvim/regexp_nfa.c index 56e488fbd4..37b6786b8f 100644 --- a/src/nvim/regexp_nfa.c +++ b/src/nvim/regexp_nfa.c @@ -5524,12 +5524,12 @@ static int nfa_regmatch(nfa_regprog_T *prog, nfa_state_T *start, regsubs_T *subm 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; -- cgit From caabcae0b7470731e793c199b905bfa1bb696914 Mon Sep 17 00:00:00 2001 From: Felipe Oliveira Carvalho Date: Wed, 22 Apr 2015 19:47:53 -0300 Subject: Replace VIM_ISDIGIT() and vim_isdigit() with ascii_isdigit() defined in ascii.h --- src/nvim/regexp_nfa.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/nvim/regexp_nfa.c') diff --git a/src/nvim/regexp_nfa.c b/src/nvim/regexp_nfa.c index 37b6786b8f..05a3c51182 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: @@ -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,7 +5519,7 @@ 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; -- cgit From 2ca8afc74eada76f50ae60dbb0d6f1804d36bed5 Mon Sep 17 00:00:00 2001 From: Felipe Oliveira Carvalho Date: Wed, 22 Apr 2015 19:49:53 -0300 Subject: Replace vim_isxdigit() with to ascii_isxdigit() defined in ascii.h --- src/nvim/regexp_nfa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/nvim/regexp_nfa.c') diff --git a/src/nvim/regexp_nfa.c b/src/nvim/regexp_nfa.c index 05a3c51182..3daf6a8544 100644 --- a/src/nvim/regexp_nfa.c +++ b/src/nvim/regexp_nfa.c @@ -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: -- cgit