1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use isAsciiDigit() in a few more places in qlocale.cpp

Browse Source 
Use the function now in qtools_p.h in several more places.
(A later commit rewrites the remainder away.)

Change-Id: I782f0dceffe0e6e76753643a889011a834bc3ff0
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Edward Welbourne 2023-02-23 16:48:30 +01:00
parent e0f9671338
commit d753941817
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/corelib/text/qlocale.cpp
View File

@ -3541,8 +3541,7 @@ QString QLocaleData::doubleToString(double d, int precision, DoubleForm form,
if (zero == u"0") { if (zero == u"0") {
// No need to convert digits. // No need to convert digits.
Q_ASSERT(std::all_of(buf.cbegin(), buf.cbegin() + length, [](char ch) Q_ASSERT(std::all_of(buf.cbegin(), buf.cbegin() + length, isAsciiDigit));
{ return '0' <= ch && ch <= '9'; }));
// That check is taken care of in unicodeForDigits, below. // That check is taken care of in unicodeForDigits, below.
} else if (zero.size() == 2 && zero.at(0).isHighSurrogate()) { } else if (zero.size() == 2 && zero.at(0).isHighSurrogate()) {
const char32_t zeroUcs4 = QChar::surrogateToUcs4(zero.at(0), zero.at(1)); const char32_t zeroUcs4 = QChar::surrogateToUcs4(zero.at(0), zero.at(1));
@ -3893,7 +3892,7 @@ bool QLocaleData::numberToCLocale(QStringView s, QLocale::NumberOptions number_o
// After the exponent there can only be '+', '-' or digits. // After the exponent there can only be '+', '-' or digits.
// If we find a '0' directly after some non-digit, then that is a // If we find a '0' directly after some non-digit, then that is a
// leading zero, acceptable only if it is the whole exponent. // leading zero, acceptable only if it is the whole exponent.
if (idx < length - 1 && (last < '0' || last > '9')) if (idx < length - 1 && !isAsciiDigit(last))
return false; return false;
} }
@ -3904,7 +3903,7 @@ bool QLocaleData::numberToCLocale(QStringView s, QLocale::NumberOptions number_o
} }
if (!number_options.testFlag(QLocale::RejectGroupSeparator)) { if (!number_options.testFlag(QLocale::RejectGroupSeparator)) {
if (out >= '0' && out <= '9') { if (isAsciiDigit(out)) {
if (start_of_digits_idx == -1) if (start_of_digits_idx == -1)
start_of_digits_idx = idx; start_of_digits_idx = idx;
++digitsInGroup; ++digitsInGroup;
@ -3988,7 +3987,7 @@ bool QLocaleData::validateChars(QStringView str, NumberMode numMode, QByteArray
return false; return false;
break; break;
case Exponent: case Exponent:
if (last < '0' || last > '9') { if (!isAsciiDigit(last)) {
// This is the first digit in the exponent (there may have beena '+' // This is the first digit in the exponent (there may have beena '+'
// or '-' in before). If it's a zero, the exponent is zero-padded. // or '-' in before). If it's a zero, the exponent is zero-padded.
if (c == '0' && (number_options & QLocale::RejectLeadingZeroInExponent)) if (c == '0' && (number_options & QLocale::RejectLeadingZeroInExponent))
@ -4020,7 +4019,7 @@ bool QLocaleData::validateChars(QStringView str, NumberMode numMode, QByteArray
case ',': case ',':
// Grouping is only allowed after a digit in the whole-number portion: // Grouping is only allowed after a digit in the whole-number portion:
if ((number_options & QLocale::RejectGroupSeparator) || state != Whole if ((number_options & QLocale::RejectGroupSeparator) || state != Whole
|| last < '0' || last > '9') { || !isAsciiDigit(last)) {
return false; return false;
} }
// We could check grouping sizes are correct, but fixup()s are // We could check grouping sizes are correct, but fixup()s are