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

template simplifier: improve populating template specialization maps (#1873) 

Declaration to specialization mapping is still not perfect.
This commit is contained in:
IOBYTE 2019-06-07 02:22:34 -04:00 committed by Daniel Marjamäki
parent 1584e62367
commit 81e41f129a
2 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/templatesimplifier.cpp
View File

@ -2922,6 +2922,17 @@ void TemplateSimplifier::replaceTemplateUsage(
}
}
static bool specMatch(
const TemplateSimplifier::TokenAndName &spec,
const TemplateSimplifier::TokenAndName &decl)
{
// make sure decl is really a declaration
if (decl.isPartialSpecialization() || decl.isSpecialization() || decl.isAlias())
return false;
return spec.isSameFamily(decl);
}
void TemplateSimplifier::getSpecializations()
{
// try to locate a matching declaration for each user defined specialization
@ -2929,7 +2940,7 @@ void TemplateSimplifier::getSpecializations()
if (spec.isSpecialization()) {
bool found = false;
for (auto & decl : mTemplateDeclarations) {
if (decl.isSpecialization())
if (!specMatch(spec, decl))
continue;
// make sure the scopes and names match
@ -2942,6 +2953,9 @@ void TemplateSimplifier::getSpecializations()
if (!found) {
for (auto & decl : mTemplateForwardDeclarations) {
if (!specMatch(spec, decl))
continue;
// make sure the scopes and names match
if (spec.fullName == decl.fullName) {
// @todo make sure function parameters also match
@ -2960,7 +2974,7 @@ void TemplateSimplifier::getPartialSpecializations()
if (spec.isPartialSpecialization()) {
bool found = false;
for (auto & decl : mTemplateDeclarations) {
if (decl.isPartialSpecialization())
if (!specMatch(spec, decl))
continue;
// make sure the scopes and names match
@ -2973,6 +2987,9 @@ void TemplateSimplifier::getPartialSpecializations()
if (!found) {
for (auto & decl : mTemplateForwardDeclarations) {
if (!specMatch(spec, decl))
continue;
// make sure the scopes and names match
if (spec.fullName == decl.fullName) {
// @todo make sure function parameters also match

12
lib/templatesimplifier.h
View File

@ -208,6 +208,18 @@ public:
* @return true if alias token, false if not
*/
bool isAliasToken(const Token *tok) const;
/**
* Is declaration the same family (class, function or variable).
*
* @param decl declaration to compare to
* @return true if same family, false if different family
*/
bool isSameFamily(const TemplateSimplifier::TokenAndName &decl) const {
// maks sure a family flag is set and matches
return (flags & (fIsClass | fIsFunction | fIsVariable)) &
(decl.flags & (fIsClass | fIsFunction | fIsVariable));
}
};
/**