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/macros.h | |
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/macros.h')
-rw-r--r-- | src/nvim/macros.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/nvim/macros.h b/src/nvim/macros.h index e14e998e7a..46f591eb33 100644 --- a/src/nvim/macros.h +++ b/src/nvim/macros.h @@ -56,17 +56,12 @@ # define TOUPPER_ASC(c) (((c) < 'a' || (c) > 'z') ? (c) : (c) - ('a' - 'A')) # define TOLOWER_ASC(c) (((c) < 'A' || (c) > 'Z') ? (c) : (c) + ('a' - 'A')) -/* Use our own isdigit() replacement, because on MS-Windows isdigit() returns - * non-zero for superscript 1. Also avoids that isdigit() crashes for numbers - * below 0 and above 255. */ -#define VIM_ISDIGIT(c) ((unsigned)(c) >= '0' && (unsigned)(c) <= '9') - /* Like isalpha() but reject non-ASCII characters. Can't be used with a * special key (negative value). */ # define ASCII_ISLOWER(c) ((unsigned)(c) >= 'a' && (unsigned)(c) <= 'z') # define ASCII_ISUPPER(c) ((unsigned)(c) >= 'A' && (unsigned)(c) <= 'Z') # define ASCII_ISALPHA(c) (ASCII_ISUPPER(c) || ASCII_ISLOWER(c)) -# define ASCII_ISALNUM(c) (ASCII_ISALPHA(c) || VIM_ISDIGIT(c)) +# define ASCII_ISALNUM(c) (ASCII_ISALPHA(c) || ascii_isdigit(c)) /* macro version of chartab(). * Only works with values 0-255! |