feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ProjectExplorer: Remove unneeded capture groups from regex

Browse Source 
... in LdParser.

Change-Id: I79bad5825ce78dd762dc95739cf01f5f05705036
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Christian Kandeler
2025-02-18 15:53:11 +01:00
parent ef2c05d0e6
commit aab000e222
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/projectexplorer/ldparser.cpp
View File

@@ -109,14 +109,14 @@ std::optional<OutputLineParser::Result> LdParser::checkMainRegex(
const QString &trimmedLine, const QString &originalLine) const QString &trimmedLine, const QString &originalLine)
{ {
static const auto makePattern = [] { static const auto makePattern = [] {
const QString driveSpec = "([A-Za-z]:)?"; const QString driveSpec = "(?:[A-Za-z]:)?";
const QString filePattern = QString(R"re((%1[^:]+\.[^:]+):)re").arg(driveSpec); const QString filePattern = QString(R"re((%1[^:]+\.[^:]+):)re").arg(driveSpec);
const QString lineNumber = R"re(\S+)re"; const QString lineNumber = R"re((\S+))re";
const QString elfSegmentAndOffset = R"re(\(\..+?[+-]0x[a-fA-F0-9]+\))re"; const QString elfSegmentAndOffset = R"re(\(\..+?[+-]0x[a-fA-F0-9]+\))re";
const QString positionPattern = QString("(%1|%2):").arg(lineNumber, elfSegmentAndOffset); const QString positionPattern = QString("(?:%1|%2):").arg(lineNumber, elfSegmentAndOffset);
return QString(R"re(^%1(%1)?(%2)?\s(.+)$)re").arg(filePattern, positionPattern); return QString(R"re(^%1(?:%1)?(?:%2)?\s(.+)$)re").arg(filePattern, positionPattern);
}; };
static const QRegularExpression regex(makePattern()); static const QRegularExpression regex(makePattern());
@@ -125,18 +125,18 @@ std::optional<OutputLineParser::Result> LdParser::checkMainRegex(
return {}; return {};
bool ok; bool ok;
int lineno = match.captured(7).toInt(&ok); int lineno = match.captured(3).toInt(&ok);
if (!ok) if (!ok)
lineno = -1; lineno = -1;
FilePath filePath = absoluteFilePath(FilePath::fromUserInput(match.captured(1))); FilePath filePath = absoluteFilePath(FilePath::fromUserInput(match.captured(1)));
int capIndex = 1; int capIndex = 1;
const QString sourceFileName = match.captured(4); const QString sourceFileName = match.captured(2);
if (!sourceFileName.isEmpty() && !sourceFileName.startsWith(QLatin1String("(.text")) if (!sourceFileName.isEmpty() && !sourceFileName.startsWith(QLatin1String("(.text"))
&& !sourceFileName.startsWith(QLatin1String("(.data"))) { && !sourceFileName.startsWith(QLatin1String("(.data"))) {
filePath = absoluteFilePath(FilePath::fromUserInput(sourceFileName)); filePath = absoluteFilePath(FilePath::fromUserInput(sourceFileName));
capIndex = 4; capIndex = 2;
} }
QString description = match.captured(8).trimmed(); QString description = match.captured(4).trimmed();
static const QStringList keywords{ static const QStringList keywords{
"File format not recognized", "File format not recognized",
"undefined reference", "undefined reference",