diff options
author | Konstantin Ritt <ritt.ks@gmail.com> | 2012-04-10 23:36:21 +0300 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-11 15:57:32 +0200 |
commit | 3ddd768504f9f55c04bec9beb8eb9bac9a7e5edc (patch) | |
tree | c9862091ee484ee676a8e0f915181637405c690e /src/corelib/tools/qchar.h | |
parent | 7386ab17df94e58efeb2f2fba91b9f816834c077 (diff) |
QChar: optimize some methods a bit for general case
by reordering and regrouping conditions so that they lead to result earlier
in most-common usecases (l.letters, spaces and puncts, u.letters, other);
there are no title cased letters in range [0..127] -> use this in isTitleCase();
test for 0xa0 (nbsp) early in isSpace() as it is quite common in HTML, etc.;
add early test to isNumber().
Change-Id: Ib415f34cb1212d9ccf8753de2d1beaece1aa2243
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'src/corelib/tools/qchar.h')
-rw-r--r-- | src/corelib/tools/qchar.h | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/src/corelib/tools/qchar.h b/src/corelib/tools/qchar.h index 3209ffb0f2..9f2ca7ae9e 100644 --- a/src/corelib/tools/qchar.h +++ b/src/corelib/tools/qchar.h @@ -233,35 +233,31 @@ public: bool isPrint() const; bool isPunct() const; inline bool isSpace() const { + // note that [0x09..0x0d] + 0x85 are exceptional Cc-s and must be handled explicitly return ucs == 0x20 || (ucs <= 0x0D && ucs >= 0x09) - || (ucs > 127 && (ucs == 0x0085 || isSpace(ucs))); + || (ucs > 127 && (ucs == 0x85 || ucs == 0xa0 || isSpace(ucs))); } bool isMark() const; inline bool isLetter() const { - return (ucs >= 'a' && ucs <= 'z') - || (ucs <= 'Z' && ucs >= 'A') + return (ucs >= 'A' && ucs <= 'z' && (ucs >= 'a' || ucs <= 'Z')) || (ucs > 127 && isLetter(ucs)); } - bool isNumber() const; + inline bool isNumber() const + { return (ucs <= '9' && ucs >= '0') || (ucs > 127 && isNumber(ucs)); } inline bool isLetterOrNumber() const { - return (ucs >= 'a' && ucs <= 'z') - || (ucs <= 'Z' && ucs >= 'A') - || (ucs <= '9' && ucs >= '0') + return (ucs >= 'A' && ucs <= 'z' && (ucs >= 'a' || ucs <= 'Z')) + || (ucs >= '0' && ucs <= '9') || (ucs > 127 && isLetterOrNumber(ucs)); } inline bool isDigit() const { return (ucs <= '9' && ucs >= '0') || (ucs > 127 && isDigit(ucs)); } bool isSymbol() const; - inline bool isLower() const { - return (ucs >= 'a' && ucs <= 'z') - || (ucs > 127 && category(ucs) == Letter_Lowercase); - } - inline bool isUpper() const { - return (ucs <= 'Z' && ucs >= 'A') - || (ucs > 127 && category(ucs) == Letter_Uppercase); - } - inline bool isTitleCase() const { return category() == Letter_Titlecase; } + inline bool isLower() const + { return (ucs <= 'z' && ucs >= 'a') || (ucs > 127 && category() == Letter_Lowercase); } + inline bool isUpper() const + { return (ucs <= 'Z' && ucs >= 'A') || (ucs > 127 && category() == Letter_Uppercase); } + inline bool isTitleCase() const { return ucs > 127 && category() == Letter_Titlecase; } inline bool isHighSurrogate() const { return ((ucs & 0xfc00) == 0xd800); @@ -331,6 +327,7 @@ public: private: static bool QT_FASTCALL isDigit(ushort ucs2); static bool QT_FASTCALL isLetter(ushort ucs2); + static bool QT_FASTCALL isNumber(ushort ucs2); static bool QT_FASTCALL isLetterOrNumber(ushort ucs2); static bool QT_FASTCALL isSpace(ushort ucs2); |