AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QString: make ucstricmp() parameters match the compareStrings'

Browse Source 
The compareStrings() entry points take QStringView and QLatin1String,
which are both ordered [size, pointer], so match that in the ucstricmp()
parameters. This further reduces the prologue of the compareStrings()
functions before reaching the case-sensitive comparison.

There's no need to do the same for the case-sensitive functions because
they're getting inlined.

Change-Id: I0e5f6bec596a4a78bd3bfffd16c8ffc980c8af0c
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
This commit is contained in:
Thiago Macieira 2022-01-10 11:35:05 -08:00
parent 2c2e2a67c3
commit b386346468
1 changed files with 20 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/corelib/text/qstring.cpp
View File

@ -1005,52 +1005,45 @@ void qt_to_latin1_unchecked(uchar *dst, const char16_t *src, qsizetype length)
qt_to_latin1_internal<false>(dst, src, length);
}
// Unicode case-insensitive comparison
Q_NEVER_INLINE static int ucstricmp(const QChar *a, const QChar *ae, const QChar *b, const QChar *be)
// Unicode case-insensitive comparison (argument order matches QStringView)
Q_NEVER_INLINE static int ucstricmp(qsizetype alen, const QChar *a, qsizetype blen, const QChar *b)
{
if (a == b)
return (ae - be);
const QChar *e = ae;
if (be - b < ae - a)
e = a + (be - b);
return (alen - blen);
char32_t alast = 0;
char32_t blast = 0;
while (a < e) {
qsizetype l = qMin(alen, blen);
qsizetype i;
for (i = 0; i < l; ++i) {
// qDebug() << Qt::hex << alast << blast;
// qDebug() << Qt::hex << "*a=" << *a << "alast=" << alast << "folded=" << foldCase (*a, alast);
// qDebug() << Qt::hex << "*b=" << *b << "blast=" << blast << "folded=" << foldCase (*b, blast);
int diff = foldCase(a->unicode(), alast) - foldCase(b->unicode(), blast);
int diff = foldCase(a[i].unicode(), alast) - foldCase(b[i].unicode(), blast);
if ((diff))
return diff;
++a;
++b;
}
if (a == ae) {
if (b == be)
if (i == alen) {
if (i == blen)
return 0;
return -1;
}
return 1;
}
// Case-insensitive comparison between a Unicode string and a QLatin1String
Q_NEVER_INLINE static int ucstricmp(const QChar *a, const QChar *ae, const char *b, const char *be)
// Case-insensitive comparison between a QStringView and a QLatin1String
// (argument order matches those types)
Q_NEVER_INLINE static int ucstricmp(qsizetype alen, const QChar *a, qsizetype blen, const char *b)
{
auto e = ae;
if (be - b < ae - a)
e = a + (be - b);
while (a < e) {
int diff = foldCase(a->unicode()) - foldCase(char16_t{uchar(*b)});
qsizetype l = qMin(alen, blen);
qsizetype i;
for (i = 0; i < l; ++i) {
int diff = foldCase(a[i].unicode()) - foldCase(char16_t{uchar(b[i])});
if ((diff))
return diff;
++a;
++b;
}
if (a == ae) {
if (b == be)
if (i == alen) {
if (i == blen)
return 0;
return -1;
}
@ -1453,7 +1446,7 @@ int QtPrivate::compareStrings(QStringView lhs, QStringView rhs, Qt::CaseSensitiv
{
if (cs == Qt::CaseSensitive)
return ucstrcmp(lhs.begin(), lhs.size(), rhs.begin(), rhs.size());
return ucstricmp(lhs.begin(), lhs.end(), rhs.begin(), rhs.end());
return ucstricmp(lhs.size(), lhs.begin(), rhs.size(), rhs.begin());
}
/*!
@ -1477,7 +1470,7 @@ int QtPrivate::compareStrings(QStringView lhs, QLatin1String rhs, Qt::CaseSensit
{
if (cs == Qt::CaseSensitive)
return ucstrcmp(lhs.begin(), lhs.size(), rhs.begin(), rhs.size());
return ucstricmp(lhs.begin(), lhs.end(), rhs.begin(), rhs.end());
return ucstricmp(lhs.size(), lhs.begin(), rhs.size(), rhs.begin());
}
/*!