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

cache failed parses as well

Browse Source
This commit is contained in:
Oswald Buddenhagen
2010-02-26 12:50:57 +01:00
parent 67cc2fe17f
commit 66780cf198
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -95,14 +95,16 @@ static void clearFunctions(ProFileEvaluator::FunctionDefs *defs)
ProFileCache::~ProFileCache()
{
foreach (ProFile *pro, parsed_files)
pro->deref();
if (pro)
pro->deref();
}
void ProFileCache::discardFile(const QString &fileName)
{
QHash<QString, ProFile *>::Iterator it = parsed_files.find(fileName);
if (it != parsed_files.end()) {
it.value()->deref();
if (it.value())
it.value()->deref();
parsed_files.erase(it);
}
}
@@ -114,17 +116,19 @@ void ProFileCache::discardFiles(const QString &prefix)
end = parsed_files.end();
while (it != end)
if (it.key().startsWith(prefix)) {
it.value()->deref();
if (it.value())
it.value()->deref();
it = parsed_files.erase(it);
} else {
++it;
}
}
void ProFileCache::addFile(ProFile *pro)
void ProFileCache::addFile(const QString &fileName, ProFile *pro)
{
parsed_files[pro->fileName()] = pro;
pro->ref();
parsed_files[fileName] = pro;
if (pro)
pro->ref();
}
ProFile *ProFileCache::getFile(const QString &fileName)
@@ -3027,10 +3031,10 @@ ProFile *ProFileEvaluator::Private::parsedProFile(const QString &fileName, bool
pro = new ProFile(fileName);
if (!(contents.isNull() ? read(pro) : read(pro, contents))) {
delete pro;
return 0;
pro = 0;
}
if (m_option->cache && cache)
m_option->cache->addFile(pro);
m_option->cache->addFile(fileName, pro);
}
return pro;
}