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

qmake: use even fewer magic numbers

Browse Source 
De-unroll the loop over the "interesting" keyword ignore comments by
using the existing array of their names. Replace magic numbers by
strlen() calls. Use local starts_with() instead of strncmp() when
comparing with fixed-size constant string literals, to avoid repeating
the fixed string's lengths for the third argument of strncmp().

Task-number: QTBUG-55458
Change-Id: If458aced382948fb719d984702857fb2171c87ee
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
This commit is contained in:
Marc Mutz 2021-11-22 08:42:49 +01:00
parent ed343669f7
commit f8ab1f0576
1 changed files with 29 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
qmake/generators/makefiledeps.cpp
View File

@ -932,6 +932,13 @@ bool QMakeSourceFileInfo::findMocs(SourceFile *file)
NumKeywords NumKeywords
}; };
static const char keywords[][19] = {
"Q_OBJECT",
"Q_GADGET",
"Q_NAMESPACE",
"Q_NAMESPACE_EXPORT",
};
static_assert(std::size(keywords) == NumKeywords);
bool ignore[NumKeywords] = {}; bool ignore[NumKeywords] = {};
/* qmake ignore Q_GADGET */ /* qmake ignore Q_GADGET */
/* qmake ignore Q_OBJECT */ /* qmake ignore Q_OBJECT */
@ -957,30 +964,26 @@ bool QMakeSourceFileInfo::findMocs(SourceFile *file)
x = SKIP_BSNL(y + 1); x = SKIP_BSNL(y + 1);
for (; x < buffer_len; x = SKIP_BSNL(x + 1)) { for (; x < buffer_len; x = SKIP_BSNL(x + 1)) {
if (buffer[x] == 't' || buffer[x] == 'q') { // ignore if (buffer[x] == 't' || buffer[x] == 'q') { // ignore
if(buffer_len >= (x + 20) && const char tag[] = "make ignore ";
!strncmp(buffer + x + 1, "make ignore Q_OBJECT", 20)) { const auto starts_with = [](const char *haystack, const char *needle) {
debug_msg(2, "Mocgen: %s:%d Found \"qmake ignore Q_OBJECT\"", return strncmp(haystack, needle, strlen(needle)) == 0;
file->file.real().toLatin1().constData(), line_count); };
x += 20; const auto is_ignore = [&](const char *keyword) {
ignore[Q_OBJECT_Keyword] = true; return buffer_len >= int(x + strlen(tag) + strlen(keyword)) &&
} else if(buffer_len >= (x + 20) && starts_with(buffer + x + 1, tag) &&
!strncmp(buffer + x + 1, "make ignore Q_GADGET", 20)) { starts_with(buffer + x + 1 + strlen(tag), keyword);
debug_msg(2, "Mocgen: %s:%d Found \"qmake ignore Q_GADGET\"", };
file->file.real().toLatin1().constData(), line_count); int interest = 0;
x += 20; for (const char *keyword : keywords) {
ignore[Q_GADGET_Keyword] = true; if (is_ignore(keyword)){
} else if (buffer_len >= (x + 23) && debug_msg(2, "Mocgen: %s:%d Found \"q%s%s\"",
!strncmp(buffer + x + 1, "make ignore Q_NAMESPACE", 23)) { file->file.real().toLatin1().constData(), line_count,
debug_msg(2, "Mocgen: %s:%d Found \"qmake ignore Q_NAMESPACE\"", tag, keyword);
file->file.real().toLatin1().constData(), line_count); x += strlen(tag);
x += 23; x += strlen(keyword);
ignore[Q_NAMESPACE_Keyword] = true; ignore[interest] = true;
} else if (buffer_len >= (x + 30) && }
!strncmp(buffer + x + 1, "make ignore Q_NAMESPACE_EXPORT", 30)) { ++interest;
debug_msg(2, "Mocgen: %s:%d Found \"qmake ignore Q_NAMESPACE_EXPORT\"",
file->file.real().toLatin1().constData(), line_count);
x += 30;
ignore[Q_NAMESPACE_EXPORT_Keyword] = true;
} }
} else if (buffer[x] == '*') { } else if (buffer[x] == '*') {
extralines = 0; extralines = 0;
@ -1008,17 +1011,15 @@ bool QMakeSourceFileInfo::findMocs(SourceFile *file)
int morelines = 0; int morelines = 0;
int y = skipEscapedLineEnds(buffer, buffer_len, x + 1, &morelines); int y = skipEscapedLineEnds(buffer, buffer_len, x + 1, &morelines);
if (buffer[y] == 'Q') { if (buffer[y] == 'Q') {
static const char interesting[][19] = { "Q_OBJECT", "Q_GADGET", "Q_NAMESPACE", "Q_NAMESPACE_EXPORT" };
static_assert(std::size(interesting) == NumKeywords);
for (int interest = 0; interest < NumKeywords; ++interest) { for (int interest = 0; interest < NumKeywords; ++interest) {
if (ignore[interest]) if (ignore[interest])
continue; continue;
int matchlen = 0, extralines = 0; int matchlen = 0, extralines = 0;
size_t needle_len = strlen(interesting[interest]); size_t needle_len = strlen(keywords[interest]);
Q_ASSERT(needle_len <= INT_MAX); Q_ASSERT(needle_len <= INT_MAX);
if (matchWhileUnsplitting(buffer, buffer_len, y, if (matchWhileUnsplitting(buffer, buffer_len, y,
interesting[interest], keywords[interest],
static_cast<int>(needle_len), static_cast<int>(needle_len),
&matchlen, &extralines) &matchlen, &extralines)
&& y + matchlen < buffer_len && y + matchlen < buffer_len