diff options
author | nyamatongwe <unknown> | 2012-07-02 15:36:58 +1000 |
---|---|---|
committer | nyamatongwe <unknown> | 2012-07-02 15:36:58 +1000 |
commit | efef37574f047fc428b9de410bd8da30809671ed (patch) | |
tree | bb4f8645d1e392864852a8a10d5e7546411a20ca | |
parent | 4d2ebae708d1b3013805f1a71af51bb8eca09f93 (diff) | |
download | scintilla-mirror-efef37574f047fc428b9de410bd8da30809671ed.tar.gz |
Make IsLowerCase and IsUpperCase not depend on non-portable isascii, take
an int argument to match similar calls, and move to header for wider use.
-rw-r--r-- | lexlib/CharacterSet.h | 8 | ||||
-rw-r--r-- | src/Document.cxx | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/lexlib/CharacterSet.h b/lexlib/CharacterSet.h index 23b5d68ea..a4234b5cc 100644 --- a/lexlib/CharacterSet.h +++ b/lexlib/CharacterSet.h @@ -93,6 +93,14 @@ inline bool IsASCII(int ch) { return (ch >= 0) && (ch < 0x80); } +inline bool IsLowerCase(int ch) { + return (ch >= 'a') && (ch <= 'z'); +} + +inline bool IsUpperCase(int ch) { + return (ch >= 'A') && (ch <= 'Z'); +} + inline bool IsAlphaNumeric(int ch) { return ((ch >= '0') && (ch <= '9')) || diff --git a/src/Document.cxx b/src/Document.cxx index 72c931b95..00ae1dbb8 100644 --- a/src/Document.cxx +++ b/src/Document.cxx @@ -48,14 +48,6 @@ static inline bool IsADigit(char ch) { return isascii(ch) && isdigit(ch); } -static inline bool IsLowerCase(char ch) { - return isascii(ch) && islower(ch); -} - -static inline bool IsUpperCase(char ch) { - return isascii(ch) && isupper(ch); -} - void LexInterface::Colourise(int start, int end) { if (pdoc && instance && !performingStyle) { // Protect against reentrance, which may occur, for example, when |