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

remove some pointless complexity relating to IncludedPriFile

Browse Source 
each such object has exactly one associated ProFile if it shall result
in a pri node, and no ProFile if it shall result in a pro node. there is
no point in dealing with lists at various levels.

Change-Id: I930fd8c14fcd6336cd297bacefdd0036f556741b
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Oswald Buddenhagen
2016-10-24 20:15:26 +02:00
parent a8010b0fff
commit 4148b05e0a
2 changed files with 46 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

106
src/plugins/qmakeprojectmanager/qmakenodes.cpp
View File

@@ -215,11 +215,10 @@ public:
class IncludedPriFile class IncludedPriFile
{ {
public: public:
ProFile *proFile;
Utils::FileName name; Utils::FileName name;
PriFileEvalResult result; PriFileEvalResult result;
QMap<Utils::FileName, IncludedPriFile *> children; QMap<Utils::FileName, IncludedPriFile *> children;
QVector<ProFile *> proFilesExact;
QVector<ProFile *> proFilesCumulative;
~IncludedPriFile() ~IncludedPriFile()
{ {
@@ -638,8 +637,7 @@ QSet<FileName> QmakePriFileNode::recursiveEnumerate(const QString &folder)
} }
PriFileEvalResult QmakePriFileNode::extractValues(const EvalInput &input, PriFileEvalResult QmakePriFileNode::extractValues(const EvalInput &input,
QVector<ProFile *> includeFilesExact, ProFile *proFile, bool haveExact,
QVector<ProFile *> includeFilesCumlative,
const QList<QList<VariableAndVPathInformation>> &variableAndVPathInformation) const QList<QList<VariableAndVPathInformation>> &variableAndVPathInformation)
{ {
PriFileEvalResult result; PriFileEvalResult result;
@@ -650,9 +648,8 @@ PriFileEvalResult QmakePriFileNode::extractValues(const EvalInput &input,
// dangerous if we get the folders wrong and enumerate the whole project // dangerous if we get the folders wrong and enumerate the whole project
// tree multiple times. // tree multiple times.
QStringList dynamicVariables = dynamicVarNames(input.readerExact); QStringList dynamicVariables = dynamicVarNames(input.readerExact);
foreach (ProFile *includeFileExact, includeFilesExact) foreach (const QString &dynamicVar, dynamicVariables)
foreach (const QString &dynamicVar, dynamicVariables) result.folders += input.readerExact->values(dynamicVar, proFile);
result.folders += input.readerExact->values(dynamicVar, includeFileExact);
for (int i=0; i < result.folders.size(); ++i) { for (int i=0; i < result.folders.size(); ++i) {
const QFileInfo fi(result.folders.at(i)); const QFileInfo fi(result.folders.at(i));
@@ -691,13 +688,15 @@ PriFileEvalResult QmakePriFileNode::extractValues(const EvalInput &input,
const QList<VariableAndVPathInformation> &qmakeVariables = variableAndVPathInformation.at(i); const QList<VariableAndVPathInformation> &qmakeVariables = variableAndVPathInformation.at(i);
QSet<FileName> newFilePaths; QSet<FileName> newFilePaths;
foreach (const VariableAndVPathInformation &qmakeVariable, qmakeVariables) { foreach (const VariableAndVPathInformation &qmakeVariable, qmakeVariables) {
foreach (ProFile *includeFileExact, includeFilesExact) { if (haveExact) {
QStringList tmp = input.readerExact->absoluteFileValues(qmakeVariable.variable, input.projectDir, qmakeVariable.vPathsExact, includeFileExact); QStringList tmp = input.readerExact->absoluteFileValues(
qmakeVariable.variable, input.projectDir, qmakeVariable.vPathsExact, proFile);
foreach (const QString &t, tmp) foreach (const QString &t, tmp)
newFilePaths += FileName::fromString(t); newFilePaths += FileName::fromString(t);
} }
foreach (ProFile *includeFileCumlative, includeFilesCumlative) { {
QStringList tmp = input.readerCumulative->absoluteFileValues(qmakeVariable.variable, input.projectDir, qmakeVariable.vPathsCumulative, includeFileCumlative); QStringList tmp = input.readerCumulative->absoluteFileValues(
qmakeVariable.variable, input.projectDir, qmakeVariable.vPathsCumulative, proFile);
foreach (const QString &t, tmp) foreach (const QString &t, tmp)
newFilePaths += FileName::fromString(t); newFilePaths += FileName::fromString(t);
} }
@@ -1800,7 +1799,8 @@ void QmakeProFileNode::setupReader()
EvalResult *QmakeProFileNode::evaluate(const EvalInput &input) EvalResult *QmakeProFileNode::evaluate(const EvalInput &input)
{ {
EvalResult *result = new EvalResult; EvalResult *result = new EvalResult;
if (ProFile *pro = input.readerExact->parsedProFile(input.projectFilePath.toString())) { ProFile *pro;
if ((pro = input.readerExact->parsedProFile(input.projectFilePath.toString()))) {
bool exactOk = input.readerExact->accept(pro, QMakeEvaluator::LoadAll); bool exactOk = input.readerExact->accept(pro, QMakeEvaluator::LoadAll);
bool cumulOk = input.readerCumulative->accept(pro, QMakeEvaluator::LoadPreFiles); bool cumulOk = input.readerCumulative->accept(pro, QMakeEvaluator::LoadPreFiles);
pro->deref(); pro->deref();
@@ -1812,6 +1812,9 @@ EvalResult *QmakeProFileNode::evaluate(const EvalInput &input)
if (result->state == EvalResult::EvalFail) if (result->state == EvalResult::EvalFail)
return result; return result;
result->includedFiles.proFile = pro;
result->includedFiles.name = input.projectFilePath;
result->projectType = proFileTemplateTypeToProjectType( result->projectType = proFileTemplateTypeToProjectType(
(result->state == EvalResult::EvalOk ? input.readerExact (result->state == EvalResult::EvalOk ? input.readerExact
: input.readerCumulative)->templateType()); : input.readerCumulative)->templateType());
@@ -1823,6 +1826,7 @@ EvalResult *QmakeProFileNode::evaluate(const EvalInput &input)
foreach (const Utils::FileName &subDirName, subDirs) { foreach (const Utils::FileName &subDirName, subDirs) {
IncludedPriFile *subDir = new IncludedPriFile; IncludedPriFile *subDir = new IncludedPriFile;
subDir->proFile = nullptr;
subDir->name = subDirName; subDir->name = subDirName;
result->includedFiles.children.insert(subDirName, subDir); result->includedFiles.children.insert(subDirName, subDir);
} }
@@ -1830,29 +1834,20 @@ EvalResult *QmakeProFileNode::evaluate(const EvalInput &input)
result->exactSubdirs = subDirs.toSet(); result->exactSubdirs = subDirs.toSet();
} }
QHash<ProFile *, QVector<ProFile *> > includeFiles = input.readerExact->includeFiles();
QVector<ProFile *> tmp = includeFiles.value(nullptr);
if (!tmp.isEmpty()) {
result->includedFiles.name = Utils::FileName::fromString(tmp.first()->fileName());
result->includedFiles.proFilesExact.append(tmp.first());
}
// Convert ProFileReader::includeFiles to IncludedPriFile structure // Convert ProFileReader::includeFiles to IncludedPriFile structure
QHash<ProFile *, QVector<ProFile *> > includeFiles = input.readerExact->includeFiles();
QList<IncludedPriFile *> toBuild = { &result->includedFiles }; QList<IncludedPriFile *> toBuild = { &result->includedFiles };
while (!toBuild.isEmpty()) { while (!toBuild.isEmpty()) {
IncludedPriFile *current = toBuild.takeFirst(); IncludedPriFile *current = toBuild.takeFirst();
foreach (ProFile *proFile, current->proFilesExact) { QVector<ProFile *> children = includeFiles.value(current->proFile);
QVector<ProFile *> children = includeFiles.value(proFile); foreach (ProFile *child, children) {
foreach (ProFile *child, children) { const Utils::FileName childName = Utils::FileName::fromString(child->fileName());
const Utils::FileName childName = Utils::FileName::fromString(child->fileName()); auto it = current->children.find(childName);
auto it = current->children.find(childName); if (it == current->children.end()) {
if (it == current->children.end()) { IncludedPriFile *childTree = new IncludedPriFile;
IncludedPriFile *childTree = new IncludedPriFile; childTree->proFile = child;
childTree->name = childName; childTree->name = childName;
it = current->children.insert(childName, childTree); current->children.insert(childName, childTree);
}
(*it)->proFilesExact.append(child);
} }
} }
toBuild.append(current->children.values()); toBuild.append(current->children.values());
@@ -1865,36 +1860,27 @@ EvalResult *QmakeProFileNode::evaluate(const EvalInput &input)
auto it = result->includedFiles.children.find(subDirName); auto it = result->includedFiles.children.find(subDirName);
if (it == result->includedFiles.children.end()) { if (it == result->includedFiles.children.end()) {
IncludedPriFile *subDir = new IncludedPriFile; IncludedPriFile *subDir = new IncludedPriFile;
subDir->proFile = nullptr;
subDir->name = subDirName; subDir->name = subDirName;
result->includedFiles.children.insert(subDirName, subDir); result->includedFiles.children.insert(subDirName, subDir);
} }
} }
} }
// Add ProFileReader::includeFiles information from cumulative parse to IncludedPriFile structure
QHash<ProFile *, QVector<ProFile *> > includeFiles = input.readerCumulative->includeFiles(); QHash<ProFile *, QVector<ProFile *> > includeFiles = input.readerCumulative->includeFiles();
QVector<ProFile *> tmp = includeFiles.value(nullptr);
if (!tmp.isEmpty()) {
result->includedFiles.name = Utils::FileName::fromString(tmp.first()->fileName());
result->includedFiles.proFilesCumulative.append(tmp.first());
}
QList<IncludedPriFile *> toBuild = { &result->includedFiles }; QList<IncludedPriFile *> toBuild = { &result->includedFiles };
// Add ProFileReader::includeFiles information from cumulative paerse to IncludedPriFile structure
while (!toBuild.isEmpty()) { while (!toBuild.isEmpty()) {
IncludedPriFile *current = toBuild.takeFirst(); IncludedPriFile *current = toBuild.takeFirst();
foreach (ProFile *proFile, current->proFilesCumulative) { QVector<ProFile *> children = includeFiles.value(current->proFile);
QVector<ProFile *> children = includeFiles.value(proFile); foreach (ProFile *child, children) {
foreach (ProFile *child, children) { const Utils::FileName childName = Utils::FileName::fromString(child->fileName());
const Utils::FileName childName = Utils::FileName::fromString(child->fileName()); auto it = current->children.find(childName);
auto it = current->children.find(childName); if (it == current->children.end()) {
if (it == current->children.end()) { IncludedPriFile *childTree = new IncludedPriFile;
IncludedPriFile *childTree = new IncludedPriFile; childTree->proFile = child;
childTree->name = childName; childTree->name = childName;
it = current->children.insert(childName, childTree); current->children.insert(childName, childTree);
}
(*it)->proFilesCumulative.append(child);
} }
} }
toBuild.append(current->children.values()); toBuild.append(current->children.values());
@@ -2025,7 +2011,8 @@ EvalResult *QmakeProFileNode::evaluate(const EvalInput &input)
QList<IncludedPriFile *> toExtract = { &result->includedFiles }; QList<IncludedPriFile *> toExtract = { &result->includedFiles };
while (!toExtract.isEmpty()) { while (!toExtract.isEmpty()) {
IncludedPriFile *current = toExtract.takeFirst(); IncludedPriFile *current = toExtract.takeFirst();
current->result = extractValues(input, current->proFilesExact, current->proFilesCumulative, variableAndVPathInformation); current->result = extractValues(input, current->proFile, (result->state == EvalResult::EvalOk),
variableAndVPathInformation);
toExtract.append(current->children.values()); toExtract.append(current->children.values());
} }
} }
@@ -2159,9 +2146,6 @@ void QmakeProFileNode::applyEvaluate(EvalResult *evalResult)
IncludedPriFile *nodeToAdd = *newIt; IncludedPriFile *nodeToAdd = *newIt;
++newIt; ++newIt;
QVector<ProFile *> filesExact = nodeToAdd->proFilesExact;
QVector<ProFile *> filesCumlative = nodeToAdd->proFilesCumulative;
// Loop preventation, make sure that exact same node is not in our parent chain // Loop preventation, make sure that exact same node is not in our parent chain
bool loop = false; bool loop = false;
Node *n = pn; Node *n = pn;
@@ -2175,10 +2159,11 @@ void QmakeProFileNode::applyEvaluate(EvalResult *evalResult)
if (loop) { if (loop) {
// Do nothing // Do nothing
} else { } else {
if (!filesExact.isEmpty() || !filesCumlative.isEmpty()) { if (nodeToAdd->proFile) {
QmakePriFileNode *qmakePriFileNode = new QmakePriFileNode(m_project, this, nodeToAdd->name); QmakePriFileNode *qmakePriFileNode = new QmakePriFileNode(m_project, this, nodeToAdd->name);
qmakePriFileNode->setParentFolderNode(pn); // Needed for loop detection qmakePriFileNode->setParentFolderNode(pn); // Needed for loop detection
qmakePriFileNode->setIncludedInExactParse(!filesExact.isEmpty() && pn->includedInExactParse()); qmakePriFileNode->setIncludedInExactParse(
(result->state == EvalResult::EvalOk) && pn->includedInExactParse());
toAdd << qmakePriFileNode; toAdd << qmakePriFileNode;
qmakePriFileNode->update(nodeToAdd->result); qmakePriFileNode->update(nodeToAdd->result);
toCompare.append(qMakePair(qmakePriFileNode, nodeToAdd)); toCompare.append(qMakePair(qmakePriFileNode, nodeToAdd));
@@ -2194,12 +2179,11 @@ void QmakeProFileNode::applyEvaluate(EvalResult *evalResult)
} }
} else { } else {
// Update existingNodeIte // Update existingNodeIte
QVector<ProFile *> filesExact = (*newIt)->proFilesExact; if ((*newIt)->proFile) {
QVector<ProFile *> filesCumlative = (*newIt)->proFilesCumulative;
if (!filesExact.isEmpty() || !filesCumlative.isEmpty()) {
QmakePriFileNode *priFileNode = static_cast<QmakePriFileNode *>(*existingIt); QmakePriFileNode *priFileNode = static_cast<QmakePriFileNode *>(*existingIt);
priFileNode->update((*newIt)->result); priFileNode->update((*newIt)->result);
priFileNode->setIncludedInExactParse(!filesExact.isEmpty() && pn->includedInExactParse()); priFileNode->setIncludedInExactParse(
(result->state == EvalResult::EvalOk) && pn->includedInExactParse());
toCompare.append(qMakePair(priFileNode, *newIt)); toCompare.append(qMakePair(priFileNode, *newIt));
} else { } else {
// We always parse exactly, because we later when async parsing don't know whether // We always parse exactly, because we later when async parsing don't know whether

2
src/plugins/qmakeprojectmanager/qmakenodes.h
View File

@@ -213,7 +213,7 @@ private:
QStringList formResources(const QString &formFile) const; QStringList formResources(const QString &formFile) const;
static QStringList baseVPaths(QtSupport::ProFileReader *reader, const QString &projectDir, const QString &buildDir); static QStringList baseVPaths(QtSupport::ProFileReader *reader, const QString &projectDir, const QString &buildDir);
static QStringList fullVPaths(const QStringList &baseVPaths, QtSupport::ProFileReader *reader, const QString &qmakeVariable, const QString &projectDir); static QStringList fullVPaths(const QStringList &baseVPaths, QtSupport::ProFileReader *reader, const QString &qmakeVariable, const QString &projectDir);
static Internal::PriFileEvalResult extractValues(const Internal::EvalInput &input, QVector<ProFile *> includeFilesExact, QVector<ProFile *> includeFilesCumlative, static Internal::PriFileEvalResult extractValues(const Internal::EvalInput &input, ProFile *proFile, bool haveExact,
const QList<QList<Internal::VariableAndVPathInformation>> &variableAndVPathInformation); const QList<QList<Internal::VariableAndVPathInformation>> &variableAndVPathInformation);
void watchFolders(const QSet<QString> &folders); void watchFolders(const QSet<QString> &folders);