From 5695cd69ea906ed270411eaf034318d187183f1c Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@nokia.com>
Date: Fri, 13 Aug 2010 13:27:02 +0200
Subject: [PATCH] Improve MSVC parser
* Handle additional information lines.
---
src/plugins/projectexplorer/msvcparser.cpp | 34 ++++++++++++++++++++--
src/plugins/projectexplorer/msvcparser.h | 1 +
2 files changed, 33 insertions(+), 2 deletions(-)
diff --git a/src/plugins/projectexplorer/msvcparser.cpp b/src/plugins/projectexplorer/msvcparser.cpp
index a4e023a418c..f47bd918760 100644
--- a/src/plugins/projectexplorer/msvcparser.cpp
+++ b/src/plugins/projectexplorer/msvcparser.cpp
@@ -30,13 +30,19 @@
#include "msvcparser.h"
#include "projectexplorerconstants.h"
+namespace {
+const char * const FILE_POS_PATTERN = "([^\\(]+)\\((\\d+)\\)\\s:";
+}
+
using namespace ProjectExplorer;
MsvcParser::MsvcParser()
{
- m_compileRegExp.setPattern("^([^\\(]+)\\((\\d+)\\)+\\s:([^:\\d]+)\\s([A-Z]+(\\d+):.*)$");
+ m_compileRegExp.setPattern(QString::fromLatin1("^") + QLatin1String(FILE_POS_PATTERN) + QLatin1String("([^:\\d]+)\\s([A-Z]+(\\d+):.*)$"));
m_compileRegExp.setMinimal(true);
- m_linkRegExp.setPattern("^([^\\(]+)\\s:[^:\\d]+(\\d+):(.*)$");
+ m_additionalInfoRegExp.setPattern(QString::fromLatin1("^ ") + QLatin1String(FILE_POS_PATTERN) + QLatin1String("\\s(.*)$"));
+ m_additionalInfoRegExp.setMinimal(true);
+ m_linkRegExp.setPattern(QString::fromLatin1("^") + QLatin1String(FILE_POS_PATTERN) + QLatin1String("[^:\\d]+(\\d+):(.*)$"));
m_linkRegExp.setMinimal(true);
}
@@ -58,6 +64,14 @@ void MsvcParser::stdOutput(const QString &line)
addTask(task);
return;
}
+ if (m_additionalInfoRegExp.indexIn(line) > -1 && m_additionalInfoRegExp.numCaptures() == 3) {
+ addTask(Task(Task::Unknown,
+ m_additionalInfoRegExp.cap(3),
+ m_additionalInfoRegExp.cap(1),
+ m_additionalInfoRegExp.cap(2).toInt(),
+ Constants::TASK_CATEGORY_COMPILE));
+ return;
+ }
if (m_linkRegExp.indexIn(lne) > -1 && m_linkRegExp.numCaptures() == 3) {
QString fileName = m_linkRegExp.cap(1);
if (fileName.contains(QLatin1String("LINK"), Qt::CaseSensitive))
@@ -135,6 +149,22 @@ void ProjectExplorerPlugin::testMsvcOutputParsers_data()
QLatin1String(ProjectExplorer::Constants::TASK_CATEGORY_COMPILE)))
<< QString();
+ QTest::newRow("additional information")
+ << QString::fromLatin1("x:\\src\\plugins\\texteditor\\icompletioncollector.h(50) : warning C4099: 'TextEditor::CompletionItem' : type name first seen using 'struct' now seen using 'class'\n"
+ " x:\\src\\plugins\\texteditor\\completionsupport.h(39) : see declaration of 'TextEditor::CompletionItem'")
+ << OutputParserTester::STDOUT
+ << QString() << QString()
+ << (QList<ProjectExplorer::Task>()
+ << Task(Task::Warning,
+ QLatin1String("C4099: 'TextEditor::CompletionItem' : type name first seen using 'struct' now seen using 'class'"),
+ QLatin1String("x:\\src\\plugins\\texteditor\\icompletioncollector.h"), 50,
+ QLatin1String(ProjectExplorer::Constants::TASK_CATEGORY_COMPILE))
+ << Task(Task::Unknown,
+ QLatin1String("see declaration of 'TextEditor::CompletionItem'"),
+ QLatin1String("x:\\src\\plugins\\texteditor\\completionsupport.h"), 39,
+ QLatin1String(ProjectExplorer::Constants::TASK_CATEGORY_COMPILE)))
+ << QString();
+
}
void ProjectExplorerPlugin::testMsvcOutputParsers()
diff --git a/src/plugins/projectexplorer/msvcparser.h b/src/plugins/projectexplorer/msvcparser.h
index 74591a5922e..26cf02eab9c 100644
--- a/src/plugins/projectexplorer/msvcparser.h
+++ b/src/plugins/projectexplorer/msvcparser.h
@@ -50,6 +50,7 @@ public:
private:
Task::TaskType toType(int number);
QRegExp m_compileRegExp;
+ QRegExp m_additionalInfoRegExp;
QRegExp m_linkRegExp;
};
--
GitLab