walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Symbol database: move finding base classes until after all classes are found because of template instantiation. Ticket: #1895

This commit is contained in:
Robert Reif 2010-08-13 07:35:30 +02:00 committed by Daniel Marjamäki
parent b92644a30c
commit a994f235c5
1 changed files with 35 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
lib/checkclass.cpp
View File

@ -285,6 +285,41 @@ void CheckClass::createSymbolDatabase()
} }
} }
} }
std::multimap<std::string, SpaceInfo *>::iterator it;
// finish filling in base class info
for (it = spaceInfoMMap.begin(); it != spaceInfoMMap.end(); ++it)
{
info = it->second;
// skip namespaces
if (info->isNamespace)
continue;
for (unsigned int i = 0; i < info->derivedFrom.size(); ++i)
{
std::multimap<std::string, SpaceInfo *>::iterator it1;
for (it1 = spaceInfoMMap.begin(); it1 != spaceInfoMMap.end(); ++it1)
{
SpaceInfo *spaceInfo = it1->second;
/** @todo handle derived base classes and namespaces */
if (!spaceInfo->isNamespace)
{
if (spaceInfo->className == info->derivedFrom[i].name)
{
if (spaceInfo->nest == info->nest)
{
info->derivedFrom[i].spaceInfo = spaceInfo;
break;
}
}
}
}
}
}
} }
CheckClass::~CheckClass() CheckClass::~CheckClass()
@ -345,26 +380,6 @@ const Token *CheckClass::initBaseInfo(SpaceInfo *info, const Token *tok)
base.spaceInfo = 0; base.spaceInfo = 0;
std::multimap<std::string, SpaceInfo *>::iterator i;
for (i = spaceInfoMMap.begin(); i != spaceInfoMMap.end(); ++i)
{
SpaceInfo *spaceInfo = i->second;
/** @todo handle derived base classes and namespaces */
if (!spaceInfo->isNamespace)
{
if (spaceInfo->className == base.name)
{
if (spaceInfo->nest == info->nest)
{
base.spaceInfo = spaceInfo;
break;
}
}
}
}
// save pattern for base class name // save pattern for base class name
info->derivedFrom.push_back(base); info->derivedFrom.push_back(base);
} }