From 5639423ea7322d5880d68c61c480a3a084ac4f8b Mon Sep 17 00:00:00 2001 From: Kent Hansen Date: Wed, 14 Sep 2011 12:53:20 +0200 Subject: Boost performance of QChar::isDigit Make it inline; add fast checks for ascii digits; add fallback function that uses the fastcall calling convention. On ia32, this change makes isDigit ~370x faster for ascii digit characters, ~250x faster for non-digit ascii characters, and ~1.5x faster for non-ascii characters. Note that this change is NOT binary compatible. Also add an autotest with expected results from before the optimization, to ensure that the behavior is the same. Change-Id: I718fadecda3f591d6f4c22374d8e476f4724fd83 Reviewed-on: http://codereview.qt-project.org/4902 Reviewed-by: Qt Sanity Bot Reviewed-by: Lars Knoll --- src/corelib/tools/qchar.cpp | 11 +++++++++-- src/corelib/tools/qchar.h | 5 ++++- 2 files changed, 13 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/corelib/tools/qchar.cpp b/src/corelib/tools/qchar.cpp index b68da9def4..5d4769d7f0 100644 --- a/src/corelib/tools/qchar.cpp +++ b/src/corelib/tools/qchar.cpp @@ -601,12 +601,19 @@ bool QChar::isLetterOrNumber() const } /*! + \fn bool QChar::isDigit() const + Returns true if the character is a decimal digit (Number_DecimalDigit); otherwise returns false. */ -bool QChar::isDigit() const + +/*! + \internal + \overload +*/ +bool QChar::isDigit(ushort ucs2) { - return (qGetProp(ucs)->category == Number_DecimalDigit); + return (qGetProp(ucs2)->category == Number_DecimalDigit); } /*! diff --git a/src/corelib/tools/qchar.h b/src/corelib/tools/qchar.h index 3efa5e511d..801cb7d699 100644 --- a/src/corelib/tools/qchar.h +++ b/src/corelib/tools/qchar.h @@ -237,7 +237,8 @@ public: bool isLetter() const; bool isNumber() const; bool isLetterOrNumber() const; - bool isDigit() const; + 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') @@ -315,6 +316,8 @@ public: static QString QT_FASTCALL decomposition(uint ucs4); private: + static bool QT_FASTCALL isDigit(ushort ucs2); + #ifdef QT_NO_CAST_FROM_ASCII QChar(char c); QChar(uchar c); -- cgit v1.2.3