diff options
author | Marc Mutz <marc.mutz@kdab.com> | 2019-09-03 20:53:31 +0200 |
---|---|---|
committer | Marc Mutz <marc.mutz@kdab.com> | 2019-09-04 16:35:37 +0000 |
commit | effbf147a425bb7b656e23927e2f733597a5b299 (patch) | |
tree | e08a9059b3a63ca399b624914ba105fef7f55105 /src/corelib/text/qstring.cpp | |
parent | 90ae72d852826c9b8a80fbd1eb551dedac655c54 (diff) |
QUnicodeTables: use array for case folding tables
Instead of four pairs of :1 :15 bit fields, use an array of four :1,
:15 structs. This allows to replace the case folding traits classes
with a simple enum that indexes into said array.
I don't know what the WASM #ifdef'ed code is supposed to effect (a :0
bit-field is only useful to separate adjacent bit-field into separate
memory locations for multi-threading), but I thought it safer to leave
it in, and that means the array must be a 64-bit block of its own, so
I had to move two fields around.
Saves ~4.5KiB in text size on optimized GCC 10 LTO Linux AMD64 builds.
Change-Id: Ib52cd7706342d5227b50b57545d073829c45da9a
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/corelib/text/qstring.cpp')
-rw-r--r-- | src/corelib/text/qstring.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/corelib/text/qstring.cpp b/src/corelib/text/qstring.cpp index 4d8eff113f..51aa0b7512 100644 --- a/src/corelib/text/qstring.cpp +++ b/src/corelib/text/qstring.cpp @@ -6629,9 +6629,9 @@ namespace QUnicodeTables { reallocate memory to grow the buffer. In that case, we need to adjust the \a it pointer. */ -template <typename Traits, typename T> +template <typename T> Q_NEVER_INLINE -static QString detachAndConvertCase(T &str, QStringIterator it) +static QString detachAndConvertCase(T &str, QStringIterator it, QUnicodeTables::Case which) { Q_ASSERT(!str.isEmpty()); QString s = std::move(str); // will copy if T is const QString @@ -6640,10 +6640,10 @@ static QString detachAndConvertCase(T &str, QStringIterator it) do { uint uc = it.nextUnchecked(); - const QUnicodeTables::Properties *prop = qGetProp(uc); - signed short caseDiff = Traits::caseDiff(prop); + const auto fold = qGetProp(uc)->cases[which]; + signed short caseDiff = fold.diff; - if (Q_UNLIKELY(Traits::caseSpecial(prop))) { + if (Q_UNLIKELY(fold.special)) { const ushort *specialCase = specialCaseMap + caseDiff; ushort length = *specialCase++; @@ -6674,8 +6674,8 @@ static QString detachAndConvertCase(T &str, QStringIterator it) return s; } -template <typename Traits, typename T> -static QString convertCase(T &str) +template <typename T> +static QString convertCase(T &str, QUnicodeTables::Case which) { const QChar *p = str.constBegin(); const QChar *e = p + str.size(); @@ -6687,9 +6687,9 @@ static QString convertCase(T &str) QStringIterator it(p, e); while (it.hasNext()) { uint uc = it.nextUnchecked(); - if (Traits::caseDiff(qGetProp(uc))) { + if (qGetProp(uc)->cases[which].diff) { it.recedeUnchecked(); - return detachAndConvertCase<Traits>(str, it); + return detachAndConvertCase(str, it, which); } } return std::move(str); @@ -6698,12 +6698,12 @@ static QString convertCase(T &str) QString QString::toLower_helper(const QString &str) { - return QUnicodeTables::convertCase<QUnicodeTables::LowercaseTraits>(str); + return QUnicodeTables::convertCase(str, QUnicodeTables::LowerCase); } QString QString::toLower_helper(QString &str) { - return QUnicodeTables::convertCase<QUnicodeTables::LowercaseTraits>(str); + return QUnicodeTables::convertCase(str, QUnicodeTables::LowerCase); } /*! @@ -6715,12 +6715,12 @@ QString QString::toLower_helper(QString &str) QString QString::toCaseFolded_helper(const QString &str) { - return QUnicodeTables::convertCase<QUnicodeTables::CasefoldTraits>(str); + return QUnicodeTables::convertCase(str, QUnicodeTables::CaseFold); } QString QString::toCaseFolded_helper(QString &str) { - return QUnicodeTables::convertCase<QUnicodeTables::CasefoldTraits>(str); + return QUnicodeTables::convertCase(str, QUnicodeTables::CaseFold); } /*! @@ -6738,12 +6738,12 @@ QString QString::toCaseFolded_helper(QString &str) QString QString::toUpper_helper(const QString &str) { - return QUnicodeTables::convertCase<QUnicodeTables::UppercaseTraits>(str); + return QUnicodeTables::convertCase(str, QUnicodeTables::UpperCase); } QString QString::toUpper_helper(QString &str) { - return QUnicodeTables::convertCase<QUnicodeTables::UppercaseTraits>(str); + return QUnicodeTables::convertCase(str, QUnicodeTables::UpperCase); } #if QT_DEPRECATED_SINCE(5, 14) |