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

move include recursion check to evaluateFile() where it belongs

Browse Source
This commit is contained in:
Oswald Buddenhagen
2009-08-04 20:39:28 +02:00
parent f4cc46d5de
commit 81f6001f91
1 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/shared/proparser/profileevaluator.cpp
View File

@@ -2614,24 +2614,17 @@ QStringList ProFileEvaluator::Private::values(const QString &variableName, const
return values(variableName, m_filevaluemap[pro], pro); return values(variableName, m_filevaluemap[pro], pro);
} }
// virtual
ProFile *ProFileEvaluator::parsedProFile(const QString &fileName) ProFile *ProFileEvaluator::parsedProFile(const QString &fileName)
{ {
QFileInfo fi(fileName); ProFile *pro = new ProFile(fileName);
if (fi.exists()) { if (d->read(pro))
QString fn = QDir::cleanPath(fi.absoluteFilePath()); return pro;
foreach (const ProFile *pf, d->m_profileStack) delete pro;
if (pf->fileName() == fn) {
errorMessage(d->format("circular inclusion of %1").arg(fn));
return 0;
}
ProFile *pro = new ProFile(fn);
if (d->read(pro))
return pro;
delete pro;
}
return 0; return 0;
} }
// virtual
void ProFileEvaluator::releaseParsedProFile(ProFile *proFile) void ProFileEvaluator::releaseParsedProFile(ProFile *proFile)
{ {
delete proFile; delete proFile;
@@ -2639,7 +2632,16 @@ void ProFileEvaluator::releaseParsedProFile(ProFile *proFile)
bool ProFileEvaluator::Private::evaluateFile(const QString &fileName) bool ProFileEvaluator::Private::evaluateFile(const QString &fileName)
{ {
ProFile *pro = q->parsedProFile(fileName); QFileInfo fi(fileName);
if (!fi.exists())
return false;
QString fn = QDir::cleanPath(fi.absoluteFilePath());
foreach (const ProFile *pf, m_profileStack)
if (pf->fileName() == fn) {
q->errorMessage(format("circular inclusion of %1").arg(fn));
return false;
}
ProFile *pro = q->parsedProFile(fn);
if (pro) { if (pro) {
bool ok = (pro->Accept(this) == ProItem::ReturnTrue); bool ok = (pro->Accept(this) == ProItem::ReturnTrue);
q->releaseParsedProFile(pro); q->releaseParsedProFile(pro);