diff options
author | Kent Hansen <kent.hansen@nokia.com> | 2011-09-14 12:53:20 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-15 20:39:28 +0200 |
commit | 5639423ea7322d5880d68c61c480a3a084ac4f8b (patch) | |
tree | 8b07bbb6e7ed6ad1972e6a0f816cfcb9a0819fd7 | |
parent | 4cd9d267e727b0b146f0f2d5b41cf62c97145fb4 (diff) |
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 <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
-rw-r--r-- | src/corelib/tools/qchar.cpp | 11 | ||||
-rw-r--r-- | src/corelib/tools/qchar.h | 5 | ||||
-rw-r--r-- | tests/auto/corelib/tools/qchar/tst_qchar.cpp | 21 |
3 files changed, 34 insertions, 3 deletions
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); diff --git a/tests/auto/corelib/tools/qchar/tst_qchar.cpp b/tests/auto/corelib/tools/qchar/tst_qchar.cpp index 02807f38b3..5a2a4834db 100644 --- a/tests/auto/corelib/tools/qchar/tst_qchar.cpp +++ b/tests/auto/corelib/tools/qchar/tst_qchar.cpp @@ -73,6 +73,8 @@ private slots: void toLower(); void toTitle(); void toCaseFolded(); + void isDigit_data(); + void isDigit(); void isPrint(); void isUpper(); void isLower(); @@ -223,6 +225,25 @@ void tst_QChar::toCaseFolded() QVERIFY(QChar::toCaseFolded((ushort)0xb5) == 0x3bc); } +void tst_QChar::isDigit_data() +{ + QTest::addColumn<ushort>("ucs"); + QTest::addColumn<bool>("expected"); + + for (ushort ucs = 0; ucs < 256; ++ucs) { + bool isDigit = (ucs <= '9' && ucs >= '0'); + QString tag = QString::fromLatin1("0x%0").arg(QString::number(ucs, 16)); + QTest::newRow(tag.toLatin1()) << ucs << isDigit; + } +} + +void tst_QChar::isDigit() +{ + QFETCH(ushort, ucs); + QFETCH(bool, expected); + QCOMPARE(QChar(ucs).isDigit(), expected); +} + void tst_QChar::isPrint() { QVERIFY(QChar('A').isPrint()); |