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

Change recursive to loop in allIncludesForDocument

Browse Source 
Change-Id: I110294efa506b5a038cfc7f4202fab001e3eefd3
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Igor Sidorov
2020-01-31 01:07:39 +03:00
parent a9e40ad14c
commit 3449618a85
2 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/libs/cplusplus/CppDocument.cpp
View File

@@ -44,6 +44,7 @@
#include <cplusplus/TypeVisitor.h>
#include <cplusplus/CoreTypes.h>
#include <QStack>
#include <QByteArray>
#include <QBitArray>
#include <QDir>
@@ -834,7 +835,23 @@ Document::Ptr Snapshot::documentFromSource(const QByteArray &preprocessedCode,
QSet<QString> Snapshot::allIncludesForDocument(const QString &fileName) const
{
QSet<QString> result;
allIncludesForDocument_helper(fileName, result);
QStack<QString> files;
files.push(fileName);
while (!files.isEmpty()) {
QString file = files.pop();
if (Document::Ptr doc = document(file)) {
const QStringList includedFiles = doc->includedFiles();
for (const QString &inc : includedFiles) {
if (!result.contains(inc)) {
result.insert(inc);
files.push(inc);
}
}
}
}
return result;
}
@@ -868,18 +885,6 @@ bool Snapshot::operator==(const Snapshot &other) const
return _documents == other._documents;
}
void Snapshot::allIncludesForDocument_helper(const QString &fileName, QSet<QString> &result) const
{
if (Document::Ptr doc = document(fileName)) {
foreach (const QString &inc, doc->includedFiles()) {
if (!result.contains(inc)) {
result.insert(inc);
allIncludesForDocument_helper(inc, result);
}
}
}
}
Document::Ptr Snapshot::document(const Utils::FilePath &fileName) const
{
return _documents.value(fileName);

2
src/libs/cplusplus/CppDocument.h
View File

@@ -450,8 +450,6 @@ public:
bool operator==(const Snapshot &other) const;
private:
void allIncludesForDocument_helper(const QString &fileName, QSet<QString> &result) const;
mutable DependencyTable m_deps;
Base _documents;
};