diff options
author | Dimitri van Heesch <dimitri@stack.nl> | 2004-07-25 09:54:32 (GMT) |
---|---|---|
committer | Dimitri van Heesch <dimitri@stack.nl> | 2004-07-25 09:54:32 (GMT) |
commit | d7bf5675c4490ac0291cf1795b7499f2047d5c58 (patch) | |
tree | 7bcf8c7c7a9b146444c2620e9aff5e8fa0899a19 /src/doxygen.cpp | |
parent | ea4704b4fde1c7b12520e45f5a67fdbc66d04e36 (diff) | |
download | Doxygen-d7bf5675c4490ac0291cf1795b7499f2047d5c58.zip Doxygen-d7bf5675c4490ac0291cf1795b7499f2047d5c58.tar.gz Doxygen-d7bf5675c4490ac0291cf1795b7499f2047d5c58.tar.bz2 |
Release-1.3.8
Diffstat (limited to 'src/doxygen.cpp')
-rw-r--r-- | src/doxygen.cpp | 57 |
1 files changed, 51 insertions, 6 deletions
diff --git a/src/doxygen.cpp b/src/doxygen.cpp index 98bb3ac..cd5d557 100644 --- a/src/doxygen.cpp +++ b/src/doxygen.cpp @@ -120,7 +120,6 @@ SDict<DefinitionList> *Doxygen::symbolMap; bool Doxygen::outputToWizard=FALSE; QDict<int> * Doxygen::htmlDirMap = 0; QCache<LookupInfo> Doxygen::lookupCache(20000,20000); -bool Doxygen::lookupCacheEnabled=FALSE; static StringList inputFiles; static StringDict excludeNameDict(1009); // sections @@ -6193,6 +6192,54 @@ static void findSectionsInDocumentation() if (Doxygen::mainPage) Doxygen::mainPage->findSectionsInDocumentation(); } +static void flushCachedTemplateRelations() +{ + // remove all references to template classes from the cache + // as there can be new template instances that should be linked + // to instead. + QCacheIterator<LookupInfo> ci(Doxygen::lookupCache); + LookupInfo *li=0; + for (ci.toFirst();(li=ci.current());++ci) + { + if (li->classDef && li->classDef->isTemplate()) + { + Doxygen::lookupCache.remove(ci.currentKey()); + } + } + // remove all cached typedef resolutions whose target is a + // template class as this may now be a template instance + MemberNameSDict::Iterator fnli(Doxygen::functionNameSDict); + MemberName *fn; + for (;(fn=fnli.current());++fnli) // for each global function name + { + MemberNameIterator fni(*fn); + MemberDef *fmd; + for (;(fmd=fni.current());++fni) // for each function with that name + { + if (fmd->isTypedefValCached()) + { + ClassDef *cd = fmd->getCachedTypedefVal(); + if (cd->isTemplate()) fmd->invalidateTypedefValCache(); + } + } + } + MemberNameSDict::Iterator mnli(Doxygen::memberNameSDict); + for (;(fn=mnli.current());++mnli) // for each class method name + { + MemberNameIterator mni(*fn); + MemberDef *fmd; + for (;(fmd=mni.current());++mni) // for each function with that name + { + if (fmd->isTypedefValCached()) + { + ClassDef *cd = fmd->getCachedTypedefVal(); + if (cd->isTemplate()) fmd->invalidateTypedefValCache(); + } + } + } +} + + //---------------------------------------------------------------------------- static void findDefineDocumentation(Entry *root) @@ -7437,7 +7484,6 @@ void initDoxygen() Doxygen::memGrpInfoDict.setAutoDelete(TRUE); Doxygen::tagDestinationDict.setAutoDelete(TRUE); Doxygen::lookupCache.setAutoDelete(TRUE); - Doxygen::lookupCacheEnabled=FALSE; } void cleanUpDoxygen() @@ -8227,6 +8273,9 @@ void parseInput() findInheritedTemplateInstances(); findUsedTemplateInstances(); + msg("Flushing cached template relations that have become invalid...\n"); + flushCachedTemplateRelations(); + msg("Creating members for template instances...\n"); createTemplateInstanceMembers(); @@ -8235,10 +8284,6 @@ void parseInput() computeClassRelations(); classEntries.clear(); - // from now on the class relations are fixed and we can - // start to cache them to improve performance - Doxygen::lookupCacheEnabled=TRUE; - msg("Searching for enumerations...\n"); findEnums(root); findEnumDocumentation(root); |