whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Modernize implementation in date-time and its parsing 

Convert several internal functions to use QStringView.
Use QStringView's toInt(), now that it has one.
Replace QLatinChar('*') with u'*' for each * found.

Fix wrong-way-round separator bounds in one call to appendSeparator().

Change-Id: If5f11d9a82820133f390ae6270b16af72065cb54
Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
bb10
Edward Welbourne 2020-09-18 17:43:12 +02:00
parent c0122d9202
commit c08592816a
3 changed files with 51 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
src/corelib/time/qdatetime.cpp
View File

@ -146,17 +146,16 @@ static int shortDayFromName(QStringView name)
return 0;
}
static ParsedRfcDateTime rfcDateImpl(const QString &s)
static ParsedRfcDateTime rfcDateImpl(QStringView s)
{
// Matches "[ddd,] dd MMM yyyy[ hh:mm[:ss]] [±hhmm]" - correct RFC 822, 2822, 5322 format -
// or "ddd MMM dd[ hh:mm:ss] yyyy [±hhmm]" - permissive RFC 850, 1036 (read only)
ParsedRfcDateTime result;
auto words = QStringView{s}.split(QLatin1Char(' '), Qt::SkipEmptyParts);
auto words = QStringView{s}.split(u' ', Qt::SkipEmptyParts);
if (words.size() < 3 || words.size() > 6)
return result;
const QChar colon(QLatin1Char(':'));
const QLocale C = QLocale::c();
const QChar colon(u':');
bool ok = true;
QDate date;
@ -172,7 +171,7 @@ static ParsedRfcDateTime rfcDateImpl(const QString &s)
do { // "loop" so that we can use break on merely invalid, but "right shape" date.
QStringView dayName;
bool rfcX22 = true;
if (words.at(0).endsWith(QLatin1Char(','))) {
if (words.at(0).endsWith(u',')) {
dayName = words.takeFirst().chopped(1);
} else if (!words.at(0).at(0).isDigit()) {
dayName = words.takeFirst();
@ -230,13 +229,13 @@ static ParsedRfcDateTime rfcDateImpl(const QString &s)
const QStringView when = words.takeFirst();
if (when.at(2) != colon || (when.size() == 8 ? when.at(5) != colon : when.size() > 5))
return result;
const int hour = C.toInt(when.left(2), &ok);
const int hour = when.left(2).toInt(&ok);
if (!ok)
return result;
const int minute = C.toInt(when.mid(3, 2), &ok);
const int minute = when.mid(3, 2).toInt(&ok);
if (!ok)
return result;
const auto secs = when.size() == 8 ? C.toInt(when.right(2), &ok) : 0;
const auto secs = when.size() == 8 ? when.right(2).toInt(&ok) : 0;
if (!ok)
return result;
time = QTime(hour, minute, secs);
@ -249,14 +248,14 @@ static ParsedRfcDateTime rfcDateImpl(const QString &s)
if (words.size() || !(zone.size() == 3 || zone.size() == 5))
return result;
bool negate = false;
if (zone.at(0) == QLatin1Char('-'))
if (zone.at(0) == u'-')
negate = true;
else if (zone.at(0) != QLatin1Char('+'))
else if (zone.at(0) != u'+')
return result;
const int hour = C.toInt(zone.mid(1, 2), &ok);
const int hour = zone.mid(1, 2).toInt(&ok);
if (!ok)
return result;
const auto minute = zone.size() > 3 ? C.toInt(zone.mid(3, 2), &ok) : 0;
const auto minute = zone.size() > 3 ? zone.mid(3, 2).toInt(&ok) : 0;
if (!ok)
return result;
offset = (hour * 60 + minute) * 60;
@ -297,31 +296,30 @@ static int fromOffsetString(QStringView offsetString, bool *valid) noexcept
// First char must be + or -
const QChar signChar = offsetString.at(0);
if (signChar == QLatin1Char('+'))
if (signChar == u'+')
sign = 1;
else if (signChar == QLatin1Char('-'))
else if (signChar == u'-')
sign = -1;
else
return 0;
// Split the hour and minute parts
const QStringView time = offsetString.mid(1);
qsizetype hhLen = time.indexOf(QLatin1Char(':'));
qsizetype hhLen = time.indexOf(u':');
qsizetype mmIndex;
if (hhLen == -1)
mmIndex = hhLen = 2; // [+-]HHmm or [+-]HH format
else
mmIndex = hhLen + 1;
const QLocale C = QLocale::c();
const QStringView hhRef = time.left(qMin(hhLen, time.size()));
bool ok = false;
const int hour = C.toInt(hhRef, &ok);
const int hour = hhRef.toInt(&ok);
if (!ok)
return 0;
const QStringView mmRef = time.mid(qMin(mmIndex, time.size()));
const int minute = mmRef.isEmpty() ? 0 : C.toInt(mmRef, &ok);
const int minute = mmRef.isEmpty() ? 0 : mmRef.toInt(&ok);
if (!ok || minute < 0 || minute > 59)
return 0;
@ -1472,7 +1470,7 @@ QDate QDate::fromString(const QString &string, Qt::DateFormat format)
return rfcDateImpl(string).date;
default:
case Qt::TextDate: {
auto parts = QStringView{string}.split(QLatin1Char(' '), Qt::SkipEmptyParts);
auto parts = QStringView{string}.split(u' ', Qt::SkipEmptyParts);
if (parts.count() != 4)
return QDate();
@ -3948,15 +3946,15 @@ QString QDateTime::toString(Qt::DateFormat format) const
const QPair<QDate, QTime> p = getDateTime(d);
buf = toStringTextDate(p.first);
// Insert time between date's day and year:
buf.insert(buf.lastIndexOf(QLatin1Char(' ')),
QLatin1Char(' ') + p.second.toString(Qt::TextDate));
buf.insert(buf.lastIndexOf(u' '),
u' ' + p.second.toString(Qt::TextDate));
// Append zone/offset indicator, as appropriate:
switch (timeSpec()) {
case Qt::LocalTime:
break;
#if QT_CONFIG(timezone)
case Qt::TimeZone:
buf += QLatin1Char(' ') + d->m_timeZone.abbreviation(*this);
buf += u' ' + d->m_timeZone.abbreviation(*this);
break;
#endif
default:
@ -3972,10 +3970,10 @@ QString QDateTime::toString(Qt::DateFormat format) const
buf = toStringIsoDate(p.first);
if (buf.isEmpty())
return QString(); // failed to convert
buf += QLatin1Char('T') + p.second.toString(format);
buf += u'T' + p.second.toString(format);
switch (getSpec(d)) {
case Qt::UTC:
buf += QLatin1Char('Z');
buf += u'Z';
break;
case Qt::OffsetFromUTC:
#if QT_CONFIG(timezone)
@ -4694,18 +4692,18 @@ QDateTime QDateTime::fromString(const QString &string, Qt::DateFormat format)
// Must be left with T (or space) and at least one digit for the hour:
if (isoString.size() < 2
|| !(isoString.startsWith(QLatin1Char('T'), Qt::CaseInsensitive)
|| !(isoString.startsWith(u'T', Qt::CaseInsensitive)
// RFC 3339 (section 5.6) allows a space here. (It actually
// allows any separator one considers more readable, merely
// giving space as an example - but let's not go wild !)
|| isoString.startsWith(QLatin1Char(' ')))) {
|| isoString.startsWith(u' '))) {
return QDateTime();
}
isoString = isoString.mid(1); // trim 'T' (or space)
int offset = 0;
// Check end of string for Time Zone definition, either Z for UTC or [+-]HH:mm for Offset
if (isoString.endsWith(QLatin1Char('Z'), Qt::CaseInsensitive)) {
if (isoString.endsWith(u'Z', Qt::CaseInsensitive)) {
spec = Qt::UTC;
isoString.chop(1); // trim 'Z'
} else {
@ -4714,14 +4712,10 @@ QDateTime QDateTime::fromString(const QString &string, Qt::DateFormat format)
int signIndex = isoString.size() - 1;
Q_ASSERT(signIndex >= 0);
bool found = false;
{
const QChar plus = QLatin1Char('+');
const QChar minus = QLatin1Char('-');
do {
QChar character(isoString.at(signIndex));
found = character == plus || character == minus;
} while (!found && --signIndex >= 0);
}
do {
QChar character(isoString[signIndex]);
found = character == u'+' || character == u'-';
} while (!found && --signIndex >= 0);
if (found) {
bool ok;
@ -4744,7 +4738,7 @@ QDateTime QDateTime::fromString(const QString &string, Qt::DateFormat format)
return QDateTime(date, time, spec, offset);
}
case Qt::TextDate: {
QList<QStringView> parts = QStringView { string }.split(QLatin1Char(' '), Qt::SkipEmptyParts);
QList<QStringView> parts = QStringView { string }.split(u' ', Qt::SkipEmptyParts);
if ((parts.count() < 5) || (parts.count() > 6))
return QDateTime();
@ -4755,9 +4749,9 @@ QDateTime QDateTime::fromString(const QString &string, Qt::DateFormat format)
// Guess which by looking for ':' in the time
int yearPart = 3;
int timePart = 3;
if (parts.at(3).contains(QLatin1Char(':')))
if (parts.at(3).contains(u':'))
yearPart = 4;
else if (parts.at(4).contains(QLatin1Char(':')))
else if (parts.at(4).contains(u':'))
timePart = 4;
else
return QDateTime();
@ -4780,7 +4774,7 @@ QDateTime QDateTime::fromString(const QString &string, Qt::DateFormat format)
month = fromShortMonthName(parts.at(2));
if (month) {
QStringView dayStr = parts.at(1);
if (dayStr.endsWith(QLatin1Char('.'))) {
if (dayStr.endsWith(u'.')) {
dayStr = dayStr.left(dayStr.size() - 1);
day = dayStr.toInt(&ok);
}

31
src/corelib/time/qdatetimeparser.cpp
View File

@ -367,20 +367,24 @@ static QString unquote(QStringView str)
return ret;
}
static inline int countRepeat(const QString &str, int index, int maxCount)
static inline int countRepeat(QStringView str, int index, int maxCount)
{
str = str.sliced(index);
if (maxCount > str.size())
maxCount = str.size();
const QChar ch(str[0]);
int count = 1;
const QChar ch(str.at(index));
const int max = qMin(index + maxCount, str.size());
while (index + count < max && str.at(index + count) == ch) {
while (count < maxCount && str[count] == ch)
++count;
}
return count;
}
static inline void appendSeparator(QStringList *list, const QString &string, int from, int size, int lastQuote)
static inline void appendSeparator(QStringList *list, QStringView string,
int from, int size, int lastQuote)
{
const QStringView separator = QStringView(string).mid(from, size);
Q_ASSERT(size >= 0 && from + size <= string.size());
const QStringView separator = string.sliced(from, size);
list->append(lastQuote >= from ? unquote(separator) : separator.toString());
}
@ -390,7 +394,7 @@ static inline void appendSeparator(QStringList *list, const QString &string, int
Parses the format \a newFormat. If successful, returns \c true and sets up
the format. Else keeps the old format and returns \c false.
*/
bool QDateTimeParser::parseFormat(const QString &newFormat)
bool QDateTimeParser::parseFormat(QStringView newFormat)
{
const QLatin1Char quote('\'');
const QLatin1Char slash('\\');
@ -495,7 +499,7 @@ bool QDateTimeParser::parseFormat(const QString &newFormat)
if (parserType != QMetaType::QTime) {
const SectionNode sn = { MonthSection, i - add, countRepeat(newFormat, i, 4), 0 };
newSectionNodes.append(sn);
newSeparators.append(unquote(QStringView{newFormat}.mid(index, i - index)));
newSeparators.append(unquote(newFormat.mid(index, i - index)));
i += sn.count - 1;
index = i + 1;
newDisplay |= MonthSection;
@ -541,13 +545,12 @@ bool QDateTimeParser::parseFormat(const QString &newFormat)
}
}
if (index < max) {
appendSeparator(&newSeparators, newFormat, index, index - max, lastQuote);
} else {
if (index < max)
appendSeparator(&newSeparators, newFormat, index, max - index, lastQuote);
else
newSeparators.append(QString());
}
displayFormat = newFormat;
displayFormat = newFormat.toString();
separators = newSeparators;
sectionNodes = newSectionNodes;
display = newDisplay;

2
src/corelib/time/qdatetimeparser_p.h
View File

@ -180,7 +180,7 @@ public:
const QDateTime &defaultValue, bool fixup) const;
bool fromString(const QString &text, QDate *date, QTime *time) const;
bool fromString(const QString &text, QDateTime* datetime) const;
bool parseFormat(const QString &format);
bool parseFormat(QStringView format);
enum FieldInfoFlag {
Numeric = 0x01,