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

QLocalePrivate: port number parsing to QStringView

Browse Source 
This ports all functions in qlocale_p.h to QStringView that can be
ported with the QStringView features we already have.

Prerequisite for QStringView::to<Integer>(), and
QLocale::to<Integer>(QStringView).

Change-Id: I52112dc199cdf3a8545e722399b1c9cceaf797e1
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
Reviewed-by: Anton Kudryavtsev <antkudr@mail.ru>
This commit is contained in:
Marc Mutz 2017-01-30 12:33:51 +01:00
parent 3fc09372fb
commit 8c779f9760
3 changed files with 41 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
src/corelib/tools/qlocale.cpp
View File

@ -1113,27 +1113,27 @@ QString QLocale::name() const
return d->languageCode() + QLatin1Char('_') + d->countryCode();
}
static qlonglong toIntegral_helper(const QLocaleData *d, const QChar *data, int len, bool *ok,
static qlonglong toIntegral_helper(const QLocaleData *d, QStringView str, bool *ok,
QLocale::NumberOptions mode, qlonglong)
{
return d->stringToLongLong(data, len, 10, ok, mode);
return d->stringToLongLong(str, 10, ok, mode);
}
static qulonglong toIntegral_helper(const QLocaleData *d, const QChar *data, int len, bool *ok,
static qulonglong toIntegral_helper(const QLocaleData *d, QStringView str, bool *ok,
QLocale::NumberOptions mode, qulonglong)
{
return d->stringToUnsLongLong(data, len, 10, ok, mode);
return d->stringToUnsLongLong(str, 10, ok, mode);
}
template <typename T> static inline
T toIntegral_helper(const QLocalePrivate *d, const QChar *data, int len, bool *ok)
T toIntegral_helper(const QLocalePrivate *d, QStringView str, bool *ok)
{
// ### Qt6: use std::conditional<std::is_unsigned<T>::value, qulonglong, qlonglong>::type
const bool isUnsigned = T(0) < T(-1);
typedef typename QtPrivate::QConditional<isUnsigned, qulonglong, qlonglong>::Type Int64;
// we select the right overload by the last, unused parameter
Int64 val = toIntegral_helper(d->m_data, data, len, ok, d->m_numberOptions, Int64());
Int64 val = toIntegral_helper(d->m_data, str, ok, d->m_numberOptions, Int64());
if (T(val) != val) {
if (ok)
*ok = false;
@ -1217,7 +1217,7 @@ QString QLocale::scriptToString(QLocale::Script script)
short QLocale::toShort(const QString &s, bool *ok) const
{
return toIntegral_helper<short>(d, s.constData(), s.size(), ok);
return toIntegral_helper<short>(d, s, ok);
}
/*!
@ -1235,7 +1235,7 @@ short QLocale::toShort(const QString &s, bool *ok) const
ushort QLocale::toUShort(const QString &s, bool *ok) const
{
return toIntegral_helper<ushort>(d, s.constData(), s.size(), ok);
return toIntegral_helper<ushort>(d, s, ok);
}
/*!
@ -1253,7 +1253,7 @@ ushort QLocale::toUShort(const QString &s, bool *ok) const
int QLocale::toInt(const QString &s, bool *ok) const
{
return toIntegral_helper<int>(d, s.constData(), s.size(), ok);
return toIntegral_helper<int>(d, s, ok);
}
/*!
@ -1271,7 +1271,7 @@ int QLocale::toInt(const QString &s, bool *ok) const
uint QLocale::toUInt(const QString &s, bool *ok) const
{
return toIntegral_helper<uint>(d, s.constData(), s.size(), ok);
return toIntegral_helper<uint>(d, s, ok);
}
/*!
@ -1290,7 +1290,7 @@ uint QLocale::toUInt(const QString &s, bool *ok) const
qlonglong QLocale::toLongLong(const QString &s, bool *ok) const
{
return toIntegral_helper<qlonglong>(d, s.constData(), s.size(), ok);
return toIntegral_helper<qlonglong>(d, s, ok);
}
/*!
@ -1309,7 +1309,7 @@ qlonglong QLocale::toLongLong(const QString &s, bool *ok) const
qulonglong QLocale::toULongLong(const QString &s, bool *ok) const
{
return toIntegral_helper<qulonglong>(d, s.constData(), s.size(), ok);
return toIntegral_helper<qulonglong>(d, s, ok);
}
/*!
@ -1352,7 +1352,7 @@ float QLocale::toFloat(const QString &s, bool *ok) const
double QLocale::toDouble(const QString &s, bool *ok) const
{
return d->m_data->stringToDouble(s.constData(), s.size(), ok, d->m_numberOptions);
return d->m_data->stringToDouble(s, ok, d->m_numberOptions);
}
/*!
@ -1372,7 +1372,7 @@ double QLocale::toDouble(const QString &s, bool *ok) const
short QLocale::toShort(const QStringRef &s, bool *ok) const
{
return toIntegral_helper<short>(d, s.constData(), s.size(), ok);
return toIntegral_helper<short>(d, s, ok);
}
/*!
@ -1392,7 +1392,7 @@ short QLocale::toShort(const QStringRef &s, bool *ok) const
ushort QLocale::toUShort(const QStringRef &s, bool *ok) const
{
return toIntegral_helper<ushort>(d, s.constData(), s.size(), ok);
return toIntegral_helper<ushort>(d, s, ok);
}
/*!
@ -1412,7 +1412,7 @@ ushort QLocale::toUShort(const QStringRef &s, bool *ok) const
int QLocale::toInt(const QStringRef &s, bool *ok) const
{
return toIntegral_helper<int>(d, s.constData(), s.size(), ok);
return toIntegral_helper<int>(d, s, ok);
}
/*!
@ -1432,7 +1432,7 @@ int QLocale::toInt(const QStringRef &s, bool *ok) const
uint QLocale::toUInt(const QStringRef &s, bool *ok) const
{
return toIntegral_helper<uint>(d, s.constData(), s.size(), ok);
return toIntegral_helper<uint>(d, s, ok);
}
/*!
@ -1453,7 +1453,7 @@ uint QLocale::toUInt(const QStringRef &s, bool *ok) const
qlonglong QLocale::toLongLong(const QStringRef &s, bool *ok) const
{
return toIntegral_helper<qlonglong>(d, s.constData(), s.size(), ok);
return toIntegral_helper<qlonglong>(d, s, ok);
}
/*!
@ -1474,7 +1474,7 @@ qlonglong QLocale::toLongLong(const QStringRef &s, bool *ok) const
qulonglong QLocale::toULongLong(const QStringRef &s, bool *ok) const
{
return toIntegral_helper<qulonglong>(d, s.constData(), s.size(), ok);
return toIntegral_helper<qulonglong>(d, s, ok);
}
/*!
@ -1521,7 +1521,7 @@ float QLocale::toFloat(const QStringRef &s, bool *ok) const
double QLocale::toDouble(const QStringRef &s, bool *ok) const
{
return d->m_data->stringToDouble(s.constData(), s.size(), ok, d->m_numberOptions);
return d->m_data->stringToDouble(s, ok, d->m_numberOptions);
}
@ -3067,12 +3067,12 @@ QString QLocaleData::unsLongLongToString(const QChar zero, const QChar group,
number. We can't detect junk here, since we don't even know the base
of the number.
*/
bool QLocaleData::numberToCLocale(const QChar *str, int len, QLocale::NumberOptions number_options,
bool QLocaleData::numberToCLocale(QStringView s, QLocale::NumberOptions number_options,
CharBuff *result) const
{
const QChar *uc = str;
int l = len;
int idx = 0;
const QChar *uc = s.data();
auto l = s.size();
decltype(l) idx = 0;
// Skip whitespace
while (idx < l && uc[idx].isSpace())
@ -3190,7 +3190,7 @@ bool QLocaleData::numberToCLocale(const QChar *str, int len, QLocale::NumberOpti
return idx == l;
}
bool QLocaleData::validateChars(const QString &str, NumberMode numMode, QByteArray *buff,
bool QLocaleData::validateChars(QStringView str, NumberMode numMode, QByteArray *buff,
int decDigits, QLocale::NumberOptions number_options) const
{
buff->clear();
@ -3204,7 +3204,7 @@ bool QLocaleData::validateChars(const QString &str, NumberMode numMode, QByteArr
bool dec = false;
int decDigitCnt = 0;
for (int i = 0; i < str.length(); ++i) {
for (QStringView::size_type i = 0; i < str.size(); ++i) {
char c = digitToCLocale(str.at(i));
if (c >= '0' && c <= '9') {
@ -3291,11 +3291,11 @@ bool QLocaleData::validateChars(const QString &str, NumberMode numMode, QByteArr
return true;
}
double QLocaleData::stringToDouble(const QChar *begin, int len, bool *ok,
double QLocaleData::stringToDouble(QStringView str, bool *ok,
QLocale::NumberOptions number_options) const
{
CharBuff buff;
if (!numberToCLocale(begin, len, number_options, &buff)) {
if (!numberToCLocale(str, number_options, &buff)) {
if (ok != 0)
*ok = false;
return 0.0;
@ -3308,11 +3308,11 @@ double QLocaleData::stringToDouble(const QChar *begin, int len, bool *ok,
return d;
}
qlonglong QLocaleData::stringToLongLong(const QChar *begin, int len, int base, bool *ok,
qlonglong QLocaleData::stringToLongLong(QStringView str, int base, bool *ok,
QLocale::NumberOptions number_options) const
{
CharBuff buff;
if (!numberToCLocale(begin, len, number_options, &buff)) {
if (!numberToCLocale(str, number_options, &buff)) {
if (ok != 0)
*ok = false;
return 0;
@ -3321,11 +3321,11 @@ qlonglong QLocaleData::stringToLongLong(const QChar *begin, int len, int base, b
return bytearrayToLongLong(buff.constData(), base, ok);
}
qulonglong QLocaleData::stringToUnsLongLong(const QChar *begin, int len, int base, bool *ok,
qulonglong QLocaleData::stringToUnsLongLong(QStringView str, int base, bool *ok,
QLocale::NumberOptions number_options) const
{
CharBuff buff;
if (!numberToCLocale(begin, len, number_options, &buff)) {
if (!numberToCLocale(str, number_options, &buff)) {
if (ok != 0)
*ok = false;
return 0;

14
src/corelib/tools/qlocale_p.h
View File

@ -254,25 +254,21 @@ public:
return float(d);
}
double stringToDouble(const QChar *begin, int len, bool *ok,
QLocale::NumberOptions number_options) const;
qint64 stringToLongLong(const QChar *begin, int len, int base, bool *ok,
QLocale::NumberOptions number_options) const;
quint64 stringToUnsLongLong(const QChar *begin, int len, int base, bool *ok,
QLocale::NumberOptions number_options) const;
double stringToDouble(QStringView str, bool *ok, QLocale::NumberOptions options) const;
qint64 stringToLongLong(QStringView str, int base, bool *ok, QLocale::NumberOptions options) const;
quint64 stringToUnsLongLong(QStringView str, int base, bool *ok, QLocale::NumberOptions options) const;
// these functions are used in QIntValidator (QtGui)
Q_CORE_EXPORT static double bytearrayToDouble(const char *num, bool *ok, bool *overflow = 0);
Q_CORE_EXPORT static qint64 bytearrayToLongLong(const char *num, int base, bool *ok, bool *overflow = 0);
Q_CORE_EXPORT static quint64 bytearrayToUnsLongLong(const char *num, int base, bool *ok);
bool numberToCLocale(const QChar *str, int len, QLocale::NumberOptions number_options,
bool numberToCLocale(QStringView s, QLocale::NumberOptions number_options,
CharBuff *result) const;
inline char digitToCLocale(QChar c) const;
// this function is used in QIntValidator (QtGui)
Q_CORE_EXPORT bool validateChars(
const QString &str, NumberMode numMode, QByteArray *buff, int decDigits = -1,
Q_CORE_EXPORT bool validateChars(QStringView str, NumberMode numMode, QByteArray *buff, int decDigits = -1,
QLocale::NumberOptions number_options = QLocale::DefaultNumberOptions) const;
public:

8
src/corelib/tools/qstring.cpp
View File

@ -6364,7 +6364,7 @@ qlonglong QString::toIntegral_helper(const QChar *data, int len, bool *ok, int b
}
#endif
return QLocaleData::c()->stringToLongLong(data, len, base, ok, QLocale::RejectGroupSeparator);
return QLocaleData::c()->stringToLongLong(QStringView(data, len), base, ok, QLocale::RejectGroupSeparator);
}
@ -6404,7 +6404,7 @@ qulonglong QString::toIntegral_helper(const QChar *data, uint len, bool *ok, int
}
#endif
return QLocaleData::c()->stringToUnsLongLong(data, len, base, ok,
return QLocaleData::c()->stringToUnsLongLong(QStringView(data, len), base, ok,
QLocale::RejectGroupSeparator);
}
@ -6606,7 +6606,7 @@ ushort QString::toUShort(bool *ok, int base) const
double QString::toDouble(bool *ok) const
{
return QLocaleData::c()->stringToDouble(constData(), size(), ok, QLocale::RejectGroupSeparator);
return QLocaleData::c()->stringToDouble(*this, ok, QLocale::RejectGroupSeparator);
}
/*!
@ -10863,7 +10863,7 @@ ushort QStringRef::toUShort(bool *ok, int base) const
double QStringRef::toDouble(bool *ok) const
{
return QLocaleData::c()->stringToDouble(constData(), size(), ok, QLocale::RejectGroupSeparator);
return QLocaleData::c()->stringToDouble(*this, ok, QLocale::RejectGroupSeparator);
}
/*!