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

template simplifier: refactor TemplateSimplifier::TokenAndName into a… (#2073) 

* template simplifier: refactor TemplateSimplifier::TokenAndName into a class

assert when more than one family flag is set

* fix function parameter names
This commit is contained in:
IOBYTE 2019-08-10 02:42:12 -04:00 committed by Daniel Marjamäki
parent 6a260929e2
commit 5fc5e3728d
3 changed files with 264 additions and 235 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

339
lib/templatesimplifier.cpp
View File

@ -37,7 +37,7 @@ namespace {
public: public:
explicit FindToken(const Token *token) : mToken(token) {} explicit FindToken(const Token *token) : mToken(token) {}
bool operator()(const TemplateSimplifier::TokenAndName &tokenAndName) const { bool operator()(const TemplateSimplifier::TokenAndName &tokenAndName) const {
return tokenAndName.token == mToken; return tokenAndName.token() == mToken;
} }
private: private:
const Token * const mToken; const Token * const mToken;
@ -47,7 +47,7 @@ namespace {
public: public:
explicit FindName(const std::string &name) : mName(name) {} explicit FindName(const std::string &name) : mName(name) {}
bool operator()(const TemplateSimplifier::TokenAndName &tokenAndName) const { bool operator()(const TemplateSimplifier::TokenAndName &tokenAndName) const {
return tokenAndName.name == mName; return tokenAndName.name() == mName;
} }
private: private:
const std::string mName; const std::string mName;
@ -57,32 +57,34 @@ namespace {
public: public:
explicit FindFullName(const std::string &fullName) : mFullName(fullName) {} explicit FindFullName(const std::string &fullName) : mFullName(fullName) {}
bool operator()(const TemplateSimplifier::TokenAndName &tokenAndName) const { bool operator()(const TemplateSimplifier::TokenAndName &tokenAndName) const {
return tokenAndName.fullName == mFullName; return tokenAndName.fullName() == mFullName;
} }
private: private:
const std::string mFullName; const std::string mFullName;
}; };
} }
TemplateSimplifier::TokenAndName::TokenAndName(Token *tok, const std::string &s) : TemplateSimplifier::TokenAndName::TokenAndName(Token *token, const std::string &scope) :
token(tok), scope(s), name(tok ? tok->str() : ""), fullName(s.empty() ? name : (s + " :: " + name)), mToken(token), mScope(scope), mName(mToken ? mToken->str() : ""),
nameToken(nullptr), paramEnd(nullptr), flags(0) mFullName(mScope.empty() ? mName : (mScope + " :: " + mName)),
mNameToken(nullptr), mParamEnd(nullptr), mFlags(0)
{ {
if (token) if (mToken)
token->templateSimplifierPointer(this); mToken->templateSimplifierPointer(this);
} }
TemplateSimplifier::TokenAndName::TokenAndName(Token *tok, const std::string &s, const Token *nt, const Token *pe) : TemplateSimplifier::TokenAndName::TokenAndName(Token *token, const std::string &scope, const Token *nameToken, const Token *paramEnd) :
token(tok), scope(s), name(nt->str()), fullName(s.empty() ? name : (s + " :: " + name)), mToken(token), mScope(scope), mName(nameToken->str()),
nameToken(nt), paramEnd(pe), flags(0) mFullName(mScope.empty() ? mName : (mScope + " :: " + mName)),
mNameToken(nameToken), mParamEnd(paramEnd), mFlags(0)
{ {
// only set flags for declaration // only set flags for declaration
if (token && nameToken && paramEnd) { if (mToken && mNameToken && mParamEnd) {
isSpecialization(Token::simpleMatch(token, "template < >")); isSpecialization(Token::simpleMatch(mToken, "template < >"));
if (!isSpecialization()) { if (!isSpecialization()) {
if (Token::simpleMatch(token->next()->findClosingBracket(), "> template <")) { if (Token::simpleMatch(mToken->next()->findClosingBracket(), "> template <")) {
const Token * temp = nameToken->tokAt(-2); const Token * temp = mNameToken->tokAt(-2);
while (Token::Match(temp, ">|%name% ::")) { while (Token::Match(temp, ">|%name% ::")) {
if (temp->str() == ">") if (temp->str() == ">")
temp = temp->findOpeningBracket()->previous(); temp = temp->findOpeningBracket()->previous();
@ -91,30 +93,30 @@ TemplateSimplifier::TokenAndName::TokenAndName(Token *tok, const std::string &s,
} }
isPartialSpecialization(temp->strAt(1) == "<"); isPartialSpecialization(temp->strAt(1) == "<");
} else } else
isPartialSpecialization(nameToken->strAt(1) == "<"); isPartialSpecialization(mNameToken->strAt(1) == "<");
} }
isAlias(paramEnd->strAt(1) == "using"); isAlias(mParamEnd->strAt(1) == "using");
if (isAlias() && isPartialSpecialization()) { if (isAlias() && isPartialSpecialization()) {
throw InternalError(tok, "partial specialization of alias templates is not permitted", InternalError::SYNTAX); throw InternalError(mToken, "partial specialization of alias templates is not permitted", InternalError::SYNTAX);
} }
if (isAlias() && isSpecialization()) { if (isAlias() && isSpecialization()) {
throw InternalError(tok, "explicit specialization of alias templates is not permitted", InternalError::SYNTAX); throw InternalError(mToken, "explicit specialization of alias templates is not permitted", InternalError::SYNTAX);
} }
isClass(Token::Match(paramEnd->next(), "class|struct|union %name% <|{|:|;|::")); isClass(Token::Match(mParamEnd->next(), "class|struct|union %name% <|{|:|;|::"));
if (token->strAt(1) == "<" && !isSpecialization()) { if (mToken->strAt(1) == "<" && !isSpecialization()) {
const Token *end = token->next()->findClosingBracket(); const Token *end = mToken->next()->findClosingBracket();
isVariadic(end && Token::findmatch(token->tokAt(2), "typename|class . . .", end)); isVariadic(end && Token::findmatch(mToken->tokAt(2), "typename|class . . .", end));
} }
const Token *tok1 = nameToken->next(); const Token *tok1 = mNameToken->next();
if (tok1->str() == "<") { if (tok1->str() == "<") {
const Token *closing = tok1->findClosingBracket(); const Token *closing = tok1->findClosingBracket();
if (closing) if (closing)
tok1 = closing->next(); tok1 = closing->next();
else else
throw InternalError(tok, "unsupported syntax", InternalError::SYNTAX); throw InternalError(mToken, "unsupported syntax", InternalError::SYNTAX);
} }
isFunction(tok1->str() == "("); isFunction(tok1->str() == "(");
isVariable(!isClass() && !isAlias() && Token::Match(tok1, "=|;")); isVariable(!isClass() && !isAlias() && Token::Match(tok1, "=|;"));
@ -135,8 +137,8 @@ TemplateSimplifier::TokenAndName::TokenAndName(Token *tok, const std::string &s,
isForwardDeclaration(tok1->str() == ";"); isForwardDeclaration(tok1->str() == ";");
} }
// check for member class or function and adjust scope // check for member class or function and adjust scope
if ((isFunction() || isClass()) && nameToken->strAt(-1) == "::") { if ((isFunction() || isClass()) && mNameToken->strAt(-1) == "::") {
const Token * start = nameToken; const Token * start = mNameToken;
while (Token::Match(start->tokAt(-2), "%name% ::") || while (Token::Match(start->tokAt(-2), "%name% ::") ||
(Token::simpleMatch(start->tokAt(-2), "> ::") && (Token::simpleMatch(start->tokAt(-2), "> ::") &&
@ -149,46 +151,51 @@ TemplateSimplifier::TokenAndName::TokenAndName(Token *tok, const std::string &s,
} }
if (start && start != nameToken) { if (start && start != nameToken) {
if (!scope.empty()) if (!mScope.empty())
scope += " ::"; mScope += " ::";
while (start && start->next() != nameToken) { while (start && start->next() != mNameToken) {
if (start->str() == "<") if (start->str() == "<")
start = start->findClosingBracket(); start = start->findClosingBracket();
else { else {
if (!scope.empty()) if (!mScope.empty())
scope += " "; mScope += " ";
scope += start->str(); mScope += start->str();
} }
start = start->next(); start = start->next();
} }
if (start) if (start)
fullName = scope.empty() ? name : (scope + " :: " + name); mFullName = mScope.empty() ? mName : (mScope + " :: " + mName);
} }
} }
} }
if (token) // make sure at most only one family flag is set
token->templateSimplifierPointer(this); assert(isClass() ? !(isFunction() || isVariable()) : true);
assert(isFunction() ? !(isClass() || isVariable()) : true);
assert(isVariable() ? !(isClass() || isFunction()) : true);
if (mToken)
mToken->templateSimplifierPointer(this);
} }
TemplateSimplifier::TokenAndName::TokenAndName(const TokenAndName& otherTok) : TemplateSimplifier::TokenAndName::TokenAndName(const TokenAndName& other) :
token(otherTok.token), scope(otherTok.scope), name(otherTok.name), fullName(otherTok.fullName), mToken(other.mToken), mScope(other.mScope), mName(other.mName), mFullName(other.mFullName),
nameToken(otherTok.nameToken), paramEnd(otherTok.paramEnd), flags(otherTok.flags) mNameToken(other.mNameToken), mParamEnd(other.mParamEnd), mFlags(other.mFlags)
{ {
if (token) if (mToken)
token->templateSimplifierPointer(this); mToken->templateSimplifierPointer(this);
} }
TemplateSimplifier::TokenAndName::~TokenAndName() TemplateSimplifier::TokenAndName::~TokenAndName()
{ {
if (token) if (mToken)
token->templateSimplifierPointers().erase(this); mToken->templateSimplifierPointers().erase(this);
} }
const Token * TemplateSimplifier::TokenAndName::aliasStartToken() const const Token * TemplateSimplifier::TokenAndName::aliasStartToken() const
{ {
if (paramEnd) if (mParamEnd)
return paramEnd->tokAt(4); return mParamEnd->tokAt(4);
return nullptr; return nullptr;
} }
@ -754,12 +761,12 @@ void TemplateSimplifier::getTemplateInstantiations()
for (const auto & decl : mTemplateDeclarations) { for (const auto & decl : mTemplateDeclarations) {
if (decl.isFunction()) if (decl.isFunction())
functionNameMap.insert(std::make_pair(decl.name, &decl)); functionNameMap.insert(std::make_pair(decl.name(), &decl));
} }
for (const auto & decl : mTemplateForwardDeclarations) { for (const auto & decl : mTemplateForwardDeclarations) {
if (decl.isFunction()) if (decl.isFunction())
functionNameMap.insert(std::make_pair(decl.name, &decl)); functionNameMap.insert(std::make_pair(decl.name(), &decl));
} }
const Token *skip = nullptr; const Token *skip = nullptr;
@ -825,10 +832,10 @@ void TemplateSimplifier::getTemplateInstantiations()
for (auto pos = functionNameMap.lower_bound(tok->str()); for (auto pos = functionNameMap.lower_bound(tok->str());
pos != functionNameMap.upper_bound(tok->str()); ++pos) { pos != functionNameMap.upper_bound(tok->str()); ++pos) {
// look for declaration with same qualification // look for declaration with same qualification
if (pos->second->fullName == fullName) { if (pos->second->fullName() == fullName) {
// make sure it is a single argument function // make sure it is a single argument function
if (Token::Match(pos->second->token->tokAt(2), "typename|class %name% >") && if (Token::Match(pos->second->token()->tokAt(2), "typename|class %name% >") &&
Token::Match(pos->second->nameToken->tokAt(2), "const| %type% &| %name%| )") && Token::Match(pos->second->nameToken()->tokAt(2), "const| %type% &| %name%| )") &&
Token::Match(tok->tokAt(2), "%num%|%str%|%char%|%bool% )")) { Token::Match(tok->tokAt(2), "%num%|%str%|%char%|%bool% )")) {
tok->insertToken(">"); tok->insertToken(">");
switch (tok->tokAt(3)->tokType()) { switch (tok->tokAt(3)->tokType()) {
@ -917,7 +924,7 @@ void TemplateSimplifier::getTemplateInstantiations()
const std::list<TokenAndName>::const_iterator it = std::find_if(mTemplateDeclarations.begin(), mTemplateDeclarations.end(), FindFullName(fullName)); const std::list<TokenAndName>::const_iterator it = std::find_if(mTemplateDeclarations.begin(), mTemplateDeclarations.end(), FindFullName(fullName));
if (it != mTemplateDeclarations.end()) { if (it != mTemplateDeclarations.end()) {
// full name matches // full name matches
addInstantiation(tok, it->scope); addInstantiation(tok, it->scope());
break; break;
} else { } else {
// full name doesn't match so try with using namespaces if available // full name doesn't match so try with using namespaces if available
@ -937,7 +944,7 @@ void TemplateSimplifier::getTemplateInstantiations()
} }
qualificationTok->insertToken(nameSpace.substr(offset), "", true); qualificationTok->insertToken(nameSpace.substr(offset), "", true);
qualificationTok->insertToken("::", "", true); qualificationTok->insertToken("::", "", true);
addInstantiation(tok, it1->scope); addInstantiation(tok, it1->scope());
found = true; found = true;
break; break;
} }
@ -994,7 +1001,7 @@ void TemplateSimplifier::useDefaultArgumentValues(TokenAndName &declaration)
std::map<std::string, unsigned int> typeParameterNames; std::map<std::string, unsigned int> typeParameterNames;
// Scan template declaration.. // Scan template declaration..
for (Token *tok = declaration.token; tok; tok = tok->next()) { for (Token *tok = declaration.token(); tok; tok = tok->next()) {
if (tok->link() && Token::Match(tok, "{|(|[")) { // Ticket #6835 if (tok->link() && Token::Match(tok, "{|(|[")) { // Ticket #6835
tok = tok->link(); tok = tok->link();
continue; continue;
@ -1037,18 +1044,18 @@ void TemplateSimplifier::useDefaultArgumentValues(TokenAndName &declaration)
// iterate through all template instantiations // iterate through all template instantiations
for (const TokenAndName &instantiation : mTemplateInstantiations) { for (const TokenAndName &instantiation : mTemplateInstantiations) {
if (declaration.fullName != instantiation.fullName) if (declaration.fullName() != instantiation.fullName())
continue; continue;
// instantiation arguments.. // instantiation arguments..
std::vector<std::vector<const Token *>> instantiationArgs; std::vector<std::vector<const Token *>> instantiationArgs;
std::size_t index = 0; std::size_t index = 0;
const Token *end = instantiation.token->next()->findClosingBracket(); const Token *end = instantiation.token()->next()->findClosingBracket();
if (!end) if (!end)
continue; continue;
if (end != instantiation.token->tokAt(2)) if (end != instantiation.token()->tokAt(2))
instantiationArgs.resize(1); instantiationArgs.resize(1);
for (const Token *tok1 = instantiation.token->tokAt(2); tok1 && tok1 != end; tok1 = tok1->next()) { for (const Token *tok1 = instantiation.token()->tokAt(2); tok1 && tok1 != end; tok1 = tok1->next()) {
if (tok1->link() && Token::Match(tok1, "{|(|[")) { if (tok1->link() && Token::Match(tok1, "{|(|[")) {
const Token *endLink = tok1->link(); const Token *endLink = tok1->link();
do { do {
@ -1073,7 +1080,7 @@ void TemplateSimplifier::useDefaultArgumentValues(TokenAndName &declaration)
} }
// count the parameters.. // count the parameters..
Token *tok = instantiation.token->next(); Token *tok = instantiation.token()->next();
unsigned int usedpar = templateParameters(tok); unsigned int usedpar = templateParameters(tok);
Token *instantiationEnd = tok->findClosingBracket(); Token *instantiationEnd = tok->findClosingBracket();
tok = instantiationEnd; tok = instantiationEnd;
@ -1131,7 +1138,7 @@ void TemplateSimplifier::useDefaultArgumentValues(TokenAndName &declaration)
} }
} }
simplifyTemplateArgs(instantiation.token->next(), instantiationEnd); simplifyTemplateArgs(instantiation.token()->next(), instantiationEnd);
} }
for (Token * const eqtok : eq) { for (Token * const eqtok : eq) {
@ -1166,7 +1173,7 @@ void TemplateSimplifier::useDefaultArgumentValues(TokenAndName &declaration)
// don't strip args from uninstantiated templates // don't strip args from uninstantiated templates
std::list<TokenAndName>::iterator ti2 = std::find_if(mTemplateInstantiations.begin(), std::list<TokenAndName>::iterator ti2 = std::find_if(mTemplateInstantiations.begin(),
mTemplateInstantiations.end(), mTemplateInstantiations.end(),
FindName(declaration.name)); FindName(declaration.name()));
if (ti2 == mTemplateInstantiations.end()) if (ti2 == mTemplateInstantiations.end())
continue; continue;
@ -1175,7 +1182,7 @@ void TemplateSimplifier::useDefaultArgumentValues(TokenAndName &declaration)
eqtok->deleteThis(); eqtok->deleteThis();
// update parameter end pointer // update parameter end pointer
declaration.paramEnd = declaration.token->next()->findClosingBracket(); declaration.paramEnd(declaration.token()->next()->findClosingBracket());
} }
} }
@ -1191,7 +1198,7 @@ void TemplateSimplifier::simplifyTemplateAliases()
// alias parameters.. // alias parameters..
std::vector<const Token *> aliasParameters; std::vector<const Token *> aliasParameters;
getTemplateParametersInDeclaration(aliasDeclaration.token->tokAt(2), aliasParameters); getTemplateParametersInDeclaration(aliasDeclaration.token()->tokAt(2), aliasParameters);
std::map<std::string, unsigned int> aliasParameterNames; std::map<std::string, unsigned int> aliasParameterNames;
for (unsigned int argnr = 0; argnr < aliasParameters.size(); ++argnr) for (unsigned int argnr = 0; argnr < aliasParameters.size(); ++argnr)
aliasParameterNames[aliasParameters[argnr]->str()] = argnr; aliasParameterNames[aliasParameters[argnr]->str()] = argnr;
@ -1200,19 +1207,19 @@ void TemplateSimplifier::simplifyTemplateAliases()
bool found = false; bool found = false;
for (std::list<TokenAndName>::iterator it2 = mTemplateInstantiations.begin(); it2 != mTemplateInstantiations.end();) { for (std::list<TokenAndName>::iterator it2 = mTemplateInstantiations.begin(); it2 != mTemplateInstantiations.end();) {
TokenAndName &aliasUsage = *it2; TokenAndName &aliasUsage = *it2;
if (!aliasUsage.token || aliasUsage.fullName != aliasDeclaration.fullName) { if (!aliasUsage.token() || aliasUsage.fullName() != aliasDeclaration.fullName()) {
++it2; ++it2;
continue; continue;
} }
// don't recurse // don't recurse
if (aliasDeclaration.isAliasToken(aliasUsage.token)) { if (aliasDeclaration.isAliasToken(aliasUsage.token())) {
++it2; ++it2;
continue; continue;
} }
std::vector<std::pair<Token *, Token *>> args; std::vector<std::pair<Token *, Token *>> args;
Token *tok2 = aliasUsage.token->tokAt(2); Token *tok2 = aliasUsage.token()->tokAt(2);
while (tok2) { while (tok2) {
Token * const start = tok2; Token * const start = tok2;
while (tok2 && !Token::Match(tok2, "[,>;{}]")) { while (tok2 && !Token::Match(tok2, "[,>;{}]")) {
@ -1238,7 +1245,7 @@ void TemplateSimplifier::simplifyTemplateAliases()
mChanged = true; mChanged = true;
// copy template-id from declaration to after instantiation // copy template-id from declaration to after instantiation
Token * dst = aliasUsage.token->next()->findClosingBracket(); Token * dst = aliasUsage.token()->next()->findClosingBracket();
Token * end = TokenList::copyTokens(dst, aliasDeclaration.aliasStartToken(), aliasDeclaration.aliasEndToken()->previous(), false)->next(); Token * end = TokenList::copyTokens(dst, aliasDeclaration.aliasStartToken(), aliasDeclaration.aliasEndToken()->previous(), false)->next();
// replace parameters // replace parameters
@ -1269,13 +1276,13 @@ void TemplateSimplifier::simplifyTemplateAliases()
mTemplateInstantiations.end(), mTemplateInstantiations.end(),
FindToken(tok1)); FindToken(tok1));
if (it != mTemplateInstantiations.end()) if (it != mTemplateInstantiations.end())
addInstantiation(tok2, it->scope); addInstantiation(tok2, it->scope());
} }
} }
} }
// erase the instantiation tokens // erase the instantiation tokens
eraseTokens(aliasUsage.token->previous(), dst->next()); eraseTokens(aliasUsage.token()->previous(), dst->next());
found = true; found = true;
// erase this instantiation // erase this instantiation
@ -1286,8 +1293,8 @@ void TemplateSimplifier::simplifyTemplateAliases()
Token *end = const_cast<Token *>(aliasDeclaration.aliasEndToken()); Token *end = const_cast<Token *>(aliasDeclaration.aliasEndToken());
// remove declaration tokens // remove declaration tokens
if (aliasDeclaration.token->previous()) if (aliasDeclaration.token()->previous())
eraseTokens(aliasDeclaration.token->previous(), end->next() ? end->next() : end); eraseTokens(aliasDeclaration.token()->previous(), end->next() ? end->next() : end);
else { else {
eraseTokens(mTokenList.front(), end->next() ? end->next() : end); eraseTokens(mTokenList.front(), end->next() ? end->next() : end);
deleteToken(mTokenList.front()); deleteToken(mTokenList.front());
@ -1457,8 +1464,8 @@ void TemplateSimplifier::addNamespace(const TokenAndName &templateDeclaration, c
std::string::size_type start = 0; std::string::size_type start = 0;
std::string::size_type end = 0; std::string::size_type end = 0;
while ((end = templateDeclaration.scope.find(" ", start)) != std::string::npos) { while ((end = templateDeclaration.scope().find(" ", start)) != std::string::npos) {
std::string token = templateDeclaration.scope.substr(start, end - start); std::string token = templateDeclaration.scope().substr(start, end - start);
// done if scopes overlap // done if scopes overlap
if (token == tokStart->str() && tok->strAt(-1) != "::") if (token == tokStart->str() && tok->strAt(-1) != "::")
break; break;
@ -1469,13 +1476,13 @@ void TemplateSimplifier::addNamespace(const TokenAndName &templateDeclaration, c
start = end + 1; start = end + 1;
} }
// don't add if it already exists // don't add if it already exists
std::string token = templateDeclaration.scope.substr(start, end - start); std::string token = templateDeclaration.scope().substr(start, end - start);
if (token != tokStart->str() || tok->strAt(-1) != "::") { if (token != tokStart->str() || tok->strAt(-1) != "::") {
if (insert) { if (insert) {
mTokenList.back()->tokAt(offset)->insertToken(templateDeclaration.scope.substr(start), ""); mTokenList.back()->tokAt(offset)->insertToken(templateDeclaration.scope().substr(start), "");
mTokenList.back()->tokAt(offset)->insertToken("::", ""); mTokenList.back()->tokAt(offset)->insertToken("::", "");
} else { } else {
mTokenList.addtoken(templateDeclaration.scope.substr(start), tok->linenr(), tok->fileIndex()); mTokenList.addtoken(templateDeclaration.scope().substr(start), tok->linenr(), tok->fileIndex());
mTokenList.addtoken("::", tok->linenr(), tok->fileIndex()); mTokenList.addtoken("::", tok->linenr(), tok->fileIndex());
} }
} }
@ -1483,7 +1490,7 @@ void TemplateSimplifier::addNamespace(const TokenAndName &templateDeclaration, c
bool TemplateSimplifier::alreadyHasNamespace(const TokenAndName &templateDeclaration, const Token *tok) bool TemplateSimplifier::alreadyHasNamespace(const TokenAndName &templateDeclaration, const Token *tok)
{ {
std::string scope = templateDeclaration.scope; std::string scope = templateDeclaration.scope();
// get the length in tokens of the namespace // get the length in tokens of the namespace
std::string::size_type pos = 0; std::string::size_type pos = 0;
@ -1507,8 +1514,8 @@ void TemplateSimplifier::expandTemplate(
bool inTemplateDefinition = false; bool inTemplateDefinition = false;
const Token *startOfTemplateDeclaration = nullptr; const Token *startOfTemplateDeclaration = nullptr;
const Token *endOfTemplateDefinition = nullptr; const Token *endOfTemplateDefinition = nullptr;
const Token * const templateDeclarationNameToken = templateDeclaration.nameToken; const Token * const templateDeclarationNameToken = templateDeclaration.nameToken();
const Token * const templateDeclarationToken = templateDeclaration.paramEnd; const Token * const templateDeclarationToken = templateDeclaration.paramEnd();
const bool isClass = templateDeclaration.isClass(); const bool isClass = templateDeclaration.isClass();
const bool isFunction = templateDeclaration.isFunction(); const bool isFunction = templateDeclaration.isFunction();
const bool isSpecialization = templateDeclaration.isSpecialization(); const bool isSpecialization = templateDeclaration.isSpecialization();
@ -1522,13 +1529,13 @@ void TemplateSimplifier::expandTemplate(
// add forward declarations // add forward declarations
if (copy && isClass) { if (copy && isClass) {
templateDeclaration.token->insertToken(templateDeclarationToken->strAt(1), "", true); templateDeclaration.token()->insertToken(templateDeclarationToken->strAt(1), "", true);
templateDeclaration.token->insertToken(newName, "", true); templateDeclaration.token()->insertToken(newName, "", true);
templateDeclaration.token->insertToken(";", "", true); templateDeclaration.token()->insertToken(";", "", true);
} else if ((isFunction && (copy || isSpecialization)) || } else if ((isFunction && (copy || isSpecialization)) ||
(isVariable && !isSpecialization) || (isVariable && !isSpecialization) ||
(isClass && isSpecialization && mTemplateSpecializationMap.find(templateDeclaration.token) != mTemplateSpecializationMap.end())) { (isClass && isSpecialization && mTemplateSpecializationMap.find(templateDeclaration.token()) != mTemplateSpecializationMap.end())) {
Token * dst = templateDeclaration.token; Token * dst = templateDeclaration.token();
Token * dstStart = dst->previous(); Token * dstStart = dst->previous();
bool isStatic = false; bool isStatic = false;
std::string scope; std::string scope;
@ -1595,7 +1602,7 @@ void TemplateSimplifier::expandTemplate(
(!isVariable || !Token::Match(typeParametersInDeclaration[itype]->previous(), "<|, %type% >|,"))) { (!isVariable || !Token::Match(typeParametersInDeclaration[itype]->previous(), "<|, %type% >|,"))) {
typeindentlevel = 0; typeindentlevel = 0;
std::stack<Token *> brackets1; // holds "(" and "{" tokens std::stack<Token *> brackets1; // holds "(" and "{" tokens
for (const Token *typetok = mTypesUsedInTemplateInstantiation[itype].token; for (const Token *typetok = mTypesUsedInTemplateInstantiation[itype].token();
typetok && (typeindentlevel > 0 || !Token::Match(typetok, ",|>")); typetok && (typeindentlevel > 0 || !Token::Match(typetok, ",|>"));
typetok = typetok->next()) { typetok = typetok->next()) {
if (Token::simpleMatch(typetok, ". . .")) { if (Token::simpleMatch(typetok, ". . .")) {
@ -1641,7 +1648,7 @@ void TemplateSimplifier::expandTemplate(
while (start->strAt(1) != templateDeclarationNameToken->str()) while (start->strAt(1) != templateDeclarationNameToken->str())
start = start->next(); start = start->next();
} else if (start->str() == templateDeclarationNameToken->str() && } else if (start->str() == templateDeclarationNameToken->str() &&
!(templateDeclaration.isFunction() && templateDeclaration.scope.empty() && !(templateDeclaration.isFunction() && templateDeclaration.scope().empty() &&
(start->strAt(-1) == "." || Token::simpleMatch(start->tokAt(-2), ". template")))) { (start->strAt(-1) == "." || Token::simpleMatch(start->tokAt(-2), ". template")))) {
if (start->strAt(1) != "<" || Token::Match(start, newName.c_str()) || !inAssignment) { if (start->strAt(1) != "<" || Token::Match(start, newName.c_str()) || !inAssignment) {
dst->insertToken(newName, "", true); dst->insertToken(newName, "", true);
@ -1649,7 +1656,7 @@ void TemplateSimplifier::expandTemplate(
start = start->next()->findClosingBracket(); start = start->next()->findClosingBracket();
} else { } else {
dst->insertToken(start->str(), "", true); dst->insertToken(start->str(), "", true);
newInstantiations.emplace_back(dst->previous(), templateDeclaration.scope); newInstantiations.emplace_back(dst->previous(), templateDeclaration.scope());
} }
} else { } else {
// check if type is a template // check if type is a template
@ -1667,7 +1674,7 @@ void TemplateSimplifier::expandTemplate(
} }
// check if type is instantiated // check if type is instantiated
for (const auto & inst : mTemplateInstantiations) { for (const auto & inst : mTemplateInstantiations) {
if (Token::simpleMatch(inst.token, name.c_str())) { if (Token::simpleMatch(inst.token(), name.c_str())) {
// use the instantiated name // use the instantiated name
dst->insertToken(name, "", true); dst->insertToken(name, "", true);
start = closing; start = closing;
@ -1713,7 +1720,7 @@ void TemplateSimplifier::expandTemplate(
if (copy && (isClass || isFunction)) { if (copy && (isClass || isFunction)) {
// check if this is an explicit instantiation // check if this is an explicit instantiation
Token * start = templateInstantiation.token; Token * start = templateInstantiation.token();
while (start && !Token::Match(start->previous(), "}|;|extern")) while (start && !Token::Match(start->previous(), "}|;|extern"))
start = start->previous(); start = start->previous();
if (Token::Match(start, "template !!<")) { if (Token::Match(start, "template !!<")) {
@ -1771,7 +1778,7 @@ void TemplateSimplifier::expandTemplate(
// member function implemented outside class definition // member function implemented outside class definition
else if (inTemplateDefinition && else if (inTemplateDefinition &&
Token::Match(tok3, "%name% <") && Token::Match(tok3, "%name% <") &&
templateInstantiation.name == tok3->str() && templateInstantiation.name() == tok3->str() &&
instantiateMatch(tok3, typeParametersInDeclaration.size(), ":: ~| %name% (")) { instantiateMatch(tok3, typeParametersInDeclaration.size(), ":: ~| %name% (")) {
// there must be template.. // there must be template..
bool istemplate = false; bool istemplate = false;
@ -1799,9 +1806,9 @@ void TemplateSimplifier::expandTemplate(
std::stack<Token *> brackets2; // holds "(" and "{" tokens std::stack<Token *> brackets2; // holds "(" and "{" tokens
while (tok5 && tok5 != tok3) { while (tok5 && tok5 != tok3) {
// replace name if found // replace name if found
if (Token::Match(tok5, "%name% <") && tok5->str() == templateInstantiation.name) { if (Token::Match(tok5, "%name% <") && tok5->str() == templateInstantiation.name()) {
if (copy) { if (copy) {
if (!templateDeclaration.scope.empty() && tok5->strAt(-1) != "::") if (!templateDeclaration.scope().empty() && tok5->strAt(-1) != "::")
addNamespace(templateDeclaration, tok5); addNamespace(templateDeclaration, tok5);
mTokenList.addtoken(newName, tok5->linenr(), tok5->fileIndex()); mTokenList.addtoken(newName, tok5->linenr(), tok5->fileIndex());
tok5 = tok5->next()->findClosingBracket(); tok5 = tok5->next()->findClosingBracket();
@ -1821,7 +1828,7 @@ void TemplateSimplifier::expandTemplate(
if (itype < typeParametersInDeclaration.size()) { if (itype < typeParametersInDeclaration.size()) {
unsigned int typeindentlevel = 0; unsigned int typeindentlevel = 0;
std::stack<Token *> brackets1; // holds "(" and "{" tokens std::stack<Token *> brackets1; // holds "(" and "{" tokens
for (const Token *typetok = mTypesUsedInTemplateInstantiation[itype].token; for (const Token *typetok = mTypesUsedInTemplateInstantiation[itype].token();
typetok && (typeindentlevel>0 || !Token::Match(typetok, ",|>")); typetok && (typeindentlevel>0 || !Token::Match(typetok, ",|>"));
typetok = typetok->next()) { typetok = typetok->next()) {
if (Token::simpleMatch(typetok, ". . .")) { if (Token::simpleMatch(typetok, ". . .")) {
@ -1889,7 +1896,7 @@ void TemplateSimplifier::expandTemplate(
tok5 = tok5->next(); tok5 = tok5->next();
} }
if (copy) { if (copy) {
if (!templateDeclaration.scope.empty() && tok3->strAt(-1) != "::") if (!templateDeclaration.scope().empty() && tok3->strAt(-1) != "::")
addNamespace(templateDeclaration, tok3); addNamespace(templateDeclaration, tok3);
mTokenList.addtoken(newName, tok3->linenr(), tok3->fileIndex()); mTokenList.addtoken(newName, tok3->linenr(), tok3->fileIndex());
} }
@ -1911,7 +1918,7 @@ void TemplateSimplifier::expandTemplate(
std::stack<Token *> brackets; // holds "(", "[" and "{" tokens std::stack<Token *> brackets; // holds "(", "[" and "{" tokens
// FIXME use full name matching somehow // FIXME use full name matching somehow
const std::string lastName = (templateInstantiation.name.find(' ') != std::string::npos) ? templateInstantiation.name.substr(templateInstantiation.name.rfind(' ')+1) : templateInstantiation.name; const std::string lastName = (templateInstantiation.name().find(' ') != std::string::npos) ? templateInstantiation.name().substr(templateInstantiation.name().rfind(' ')+1) : templateInstantiation.name();
for (; tok3; tok3 = tok3->next()) { for (; tok3; tok3 = tok3->next()) {
if (tok3->isName() && !Token::Match(tok3, "class|typename|struct") && !tok3->isStandardType()) { if (tok3->isName() && !Token::Match(tok3, "class|typename|struct") && !tok3->isStandardType()) {
@ -1924,7 +1931,7 @@ void TemplateSimplifier::expandTemplate(
if (itype < typeParametersInDeclaration.size()) { if (itype < typeParametersInDeclaration.size()) {
unsigned int typeindentlevel = 0; unsigned int typeindentlevel = 0;
std::stack<Token *> brackets1; // holds "(" and "{" tokens std::stack<Token *> brackets1; // holds "(" and "{" tokens
for (const Token *typetok = mTypesUsedInTemplateInstantiation[itype].token; for (const Token *typetok = mTypesUsedInTemplateInstantiation[itype].token();
typetok && (typeindentlevel>0 || !Token::Match(typetok, ",|>")); typetok && (typeindentlevel>0 || !Token::Match(typetok, ",|>"));
typetok = typetok->next()) { typetok = typetok->next()) {
if (Token::simpleMatch(typetok, ". . .")) { if (Token::simpleMatch(typetok, ". . .")) {
@ -1985,7 +1992,7 @@ void TemplateSimplifier::expandTemplate(
eraseTokens(tok3, closingBracket->next()); eraseTokens(tok3, closingBracket->next());
} }
continue; continue;
} else if (!templateDeclaration.scope.empty() && } else if (!templateDeclaration.scope().empty() &&
!alreadyHasNamespace(templateDeclaration, tok3) && !alreadyHasNamespace(templateDeclaration, tok3) &&
!Token::Match(closingBracket->next(), "(|::")) { !Token::Match(closingBracket->next(), "(|::")) {
if (copy) if (copy)
@ -1995,7 +2002,7 @@ void TemplateSimplifier::expandTemplate(
} else { } else {
if (copy) { if (copy) {
// add namespace if necessary // add namespace if necessary
if (!templateDeclaration.scope.empty() && if (!templateDeclaration.scope().empty() &&
(isClass ? tok3->strAt(1) != "(" : true)) { (isClass ? tok3->strAt(1) != "(" : true)) {
addNamespace(templateDeclaration, tok3); addNamespace(templateDeclaration, tok3);
} }
@ -2814,7 +2821,7 @@ bool TemplateSimplifier::simplifyTemplateInstantiations(
// Contains tokens such as "T" // Contains tokens such as "T"
std::vector<const Token *> typeParametersInDeclaration; std::vector<const Token *> typeParametersInDeclaration;
getTemplateParametersInDeclaration(templateDeclaration.token->tokAt(2), typeParametersInDeclaration); getTemplateParametersInDeclaration(templateDeclaration.token()->tokAt(2), typeParametersInDeclaration);
const bool printDebug = mSettings->debugwarnings; const bool printDebug = mSettings->debugwarnings;
const bool specialized = templateDeclaration.isSpecialization(); const bool specialized = templateDeclaration.isSpecialization();
const bool isfunc = templateDeclaration.isFunction(); const bool isfunc = templateDeclaration.isFunction();
@ -2837,31 +2844,31 @@ bool TemplateSimplifier::simplifyTemplateInstantiations(
} }
// already simplified // already simplified
if (!Token::Match(instantiation.token, "%name% <")) if (!Token::Match(instantiation.token(), "%name% <"))
continue; continue;
if (instantiation.fullName != templateDeclaration.fullName) { if (instantiation.fullName() != templateDeclaration.fullName()) {
// FIXME: fallback to not matching scopes until type deduction works // FIXME: fallback to not matching scopes until type deduction works
// names must match // names must match
if (instantiation.name != templateDeclaration.name) if (instantiation.name() != templateDeclaration.name())
continue; continue;
// scopes must match when present // scopes must match when present
if (!instantiation.scope.empty() && !templateDeclaration.scope.empty()) if (!instantiation.scope().empty() && !templateDeclaration.scope().empty())
continue; continue;
} }
// A global function can't be called through a pointer. // A global function can't be called through a pointer.
if (templateDeclaration.isFunction() && templateDeclaration.scope.empty() && if (templateDeclaration.isFunction() && templateDeclaration.scope().empty() &&
(instantiation.token->strAt(-1) == "." || (instantiation.token()->strAt(-1) == "." ||
Token::simpleMatch(instantiation.token->tokAt(-2), ". template"))) Token::simpleMatch(instantiation.token()->tokAt(-2), ". template")))
continue; continue;
if (!matchSpecialization(templateDeclaration.nameToken, instantiation.token, specializations)) if (!matchSpecialization(templateDeclaration.nameToken(), instantiation.token(), specializations))
continue; continue;
Token * const tok2 = instantiation.token; Token * const tok2 = instantiation.token();
if (mErrorLogger && !mTokenList.getFiles().empty()) if (mErrorLogger && !mTokenList.getFiles().empty())
mErrorLogger->reportProgress(mTokenList.getFiles()[0], "TemplateSimplifier::simplifyTemplateInstantiations()", tok2->progressValue()); mErrorLogger->reportProgress(mTokenList.getFiles()[0], "TemplateSimplifier::simplifyTemplateInstantiations()", tok2->progressValue());
#ifdef MAXTIME #ifdef MAXTIME
@ -2899,7 +2906,7 @@ bool TemplateSimplifier::simplifyTemplateInstantiations(
if (printDebug && mErrorLogger) { if (printDebug && mErrorLogger) {
std::list<const Token *> callstack(1, tok2); std::list<const Token *> callstack(1, tok2);
mErrorLogger->reportErr(ErrorLogger::ErrorMessage(callstack, &mTokenList, Severity::debug, "debug", mErrorLogger->reportErr(ErrorLogger::ErrorMessage(callstack, &mTokenList, Severity::debug, "debug",
"Failed to instantiate template \"" + instantiation.name + "\". The checking continues anyway.", false)); "Failed to instantiate template \"" + instantiation.name() + "\". The checking continues anyway.", false));
} }
if (typeForNewName.empty()) if (typeForNewName.empty())
continue; continue;
@ -2907,8 +2914,8 @@ bool TemplateSimplifier::simplifyTemplateInstantiations(
} }
// New classname/funcname.. // New classname/funcname..
const std::string newName(templateDeclaration.name + " < " + typeForNewName + " >"); const std::string newName(templateDeclaration.name() + " < " + typeForNewName + " >");
const std::string newFullName(templateDeclaration.scope + (templateDeclaration.scope.empty() ? "" : " :: ") + newName); const std::string newFullName(templateDeclaration.scope() + (templateDeclaration.scope().empty() ? "" : " :: ") + newName);
if (expandedtemplates.insert(newFullName).second) { if (expandedtemplates.insert(newFullName).second) {
expandTemplate(templateDeclaration, instantiation, typeParametersInDeclaration, newName, !specialized && !isVar); expandTemplate(templateDeclaration, instantiation, typeParametersInDeclaration, newName, !specialized && !isVar);
@ -2923,7 +2930,7 @@ bool TemplateSimplifier::simplifyTemplateInstantiations(
// process uninstantiated templates // process uninstantiated templates
// TODO: remove the specialized check and handle all uninstantiated templates someday. // TODO: remove the specialized check and handle all uninstantiated templates someday.
if (!instantiated && specialized) { if (!instantiated && specialized) {
Token * tok2 = const_cast<Token *>(templateDeclaration.nameToken); Token * tok2 = const_cast<Token *>(templateDeclaration.nameToken());
if (mErrorLogger && !mTokenList.getFiles().empty()) if (mErrorLogger && !mTokenList.getFiles().empty())
mErrorLogger->reportProgress(mTokenList.getFiles()[0], "TemplateSimplifier::simplifyTemplateInstantiations()", tok2->progressValue()); mErrorLogger->reportProgress(mTokenList.getFiles()[0], "TemplateSimplifier::simplifyTemplateInstantiations()", tok2->progressValue());
#ifdef MAXTIME #ifdef MAXTIME
@ -2955,7 +2962,7 @@ bool TemplateSimplifier::simplifyTemplateInstantiations(
if (!Token::Match(tok2, "%name% <")) if (!Token::Match(tok2, "%name% <"))
return false; return false;
if (!matchSpecialization(templateDeclaration.nameToken, tok2, specializations)) if (!matchSpecialization(templateDeclaration.nameToken(), tok2, specializations))
return false; return false;
// New type.. // New type..
@ -2967,14 +2974,14 @@ bool TemplateSimplifier::simplifyTemplateInstantiations(
if (printDebug && mErrorLogger) { if (printDebug && mErrorLogger) {
std::list<const Token *> callstack(1, tok2); std::list<const Token *> callstack(1, tok2);
mErrorLogger->reportErr(ErrorLogger::ErrorMessage(callstack, &mTokenList, Severity::debug, "debug", mErrorLogger->reportErr(ErrorLogger::ErrorMessage(callstack, &mTokenList, Severity::debug, "debug",
"Failed to instantiate template \"" + templateDeclaration.name + "\". The checking continues anyway.", false)); "Failed to instantiate template \"" + templateDeclaration.name() + "\". The checking continues anyway.", false));
} }
return false; return false;
} }
// New classname/funcname.. // New classname/funcname..
const std::string newName(templateDeclaration.name + " < " + typeForNewName + " >"); const std::string newName(templateDeclaration.name() + " < " + typeForNewName + " >");
const std::string newFullName(templateDeclaration.scope + (templateDeclaration.scope.empty() ? "" : " :: ") + newName); const std::string newFullName(templateDeclaration.scope() + (templateDeclaration.scope().empty() ? "" : " :: ") + newName);
if (expandedtemplates.insert(newFullName).second) { if (expandedtemplates.insert(newFullName).second) {
expandTemplate(templateDeclaration, templateDeclaration, typeParametersInDeclaration, newName, !specialized && !isVar); expandTemplate(templateDeclaration, templateDeclaration, typeParametersInDeclaration, newName, !specialized && !isVar);
@ -3017,16 +3024,16 @@ void TemplateSimplifier::replaceTemplateUsage(
// check if instantiation matches token instantiation from pointer // check if instantiation matches token instantiation from pointer
if (pointers.size()) { if (pointers.size()) {
// check full name // check full name
if (instantiation.fullName != (*pointers.begin())->fullName) { if (instantiation.fullName() != (*pointers.begin())->fullName()) {
// FIXME: fallback to just matching name // FIXME: fallback to just matching name
if (nameTok->str() != instantiation.name) if (nameTok->str() != instantiation.name())
continue; continue;
} }
} }
// no pointer available look at tokens directly // no pointer available look at tokens directly
else { else {
// FIXME: fallback to just matching name // FIXME: fallback to just matching name
if (nameTok->str() != instantiation.name) if (nameTok->str() != instantiation.name())
continue; continue;
} }
@ -3037,7 +3044,7 @@ void TemplateSimplifier::replaceTemplateUsage(
Token * tok2 = nameTok->tokAt(2); Token * tok2 = nameTok->tokAt(2);
const Token * endToken = nameTok->next()->findClosingBracket(); const Token * endToken = nameTok->next()->findClosingBracket();
unsigned int typeCountInInstantiation = tok2->str() == ">" ? 0U : 1U; unsigned int typeCountInInstantiation = tok2->str() == ">" ? 0U : 1U;
const Token *typetok = (!mTypesUsedInTemplateInstantiation.empty()) ? mTypesUsedInTemplateInstantiation[0].token : nullptr; const Token *typetok = (!mTypesUsedInTemplateInstantiation.empty()) ? mTypesUsedInTemplateInstantiation[0].token() : nullptr;
unsigned int indentlevel2 = 0; // indentlevel for tokgt unsigned int indentlevel2 = 0; // indentlevel for tokgt
while (tok2 != endToken && (indentlevel2 > 0 || tok2->str() != ">")) { while (tok2 != endToken && (indentlevel2 > 0 || tok2->str() != ">")) {
if (tok2->str() == "<" && (tok2->strAt(1) == ">" || templateParameters(tok2))) if (tok2->str() == "<" && (tok2->strAt(1) == ">" || templateParameters(tok2)))
@ -3060,7 +3067,7 @@ void TemplateSimplifier::replaceTemplateUsage(
typetok = typetok->next(); typetok = typetok->next();
} else { } else {
if (typeCountInInstantiation < mTypesUsedInTemplateInstantiation.size()) if (typeCountInInstantiation < mTypesUsedInTemplateInstantiation.size())
typetok = mTypesUsedInTemplateInstantiation[typeCountInInstantiation++].token; typetok = mTypesUsedInTemplateInstantiation[typeCountInInstantiation++].token();
else else
typetok = nullptr; typetok = nullptr;
} }
@ -3081,7 +3088,7 @@ void TemplateSimplifier::replaceTemplateUsage(
if (tok->isName() && !tok->templateSimplifierPointers().empty()) { if (tok->isName() && !tok->templateSimplifierPointers().empty()) {
std::list<TokenAndName>::iterator ti; std::list<TokenAndName>::iterator ti;
for (ti = mTemplateInstantiations.begin(); ti != mTemplateInstantiations.end();) { for (ti = mTemplateInstantiations.begin(); ti != mTemplateInstantiations.end();) {
if (ti->token == tok) { if (ti->token() == tok) {
mTemplateInstantiations.erase(ti++); mTemplateInstantiations.erase(ti++);
break; break;
} else { } else {
@ -3126,9 +3133,9 @@ void TemplateSimplifier::getSpecializations()
continue; continue;
// make sure the scopes and names match // make sure the scopes and names match
if (spec.fullName == decl.fullName) { if (spec.fullName() == decl.fullName()) {
// @todo make sure function parameters also match // @todo make sure function parameters also match
mTemplateSpecializationMap[spec.token] = decl.token; mTemplateSpecializationMap[spec.token()] = decl.token();
found = true; found = true;
} }
} }
@ -3139,9 +3146,9 @@ void TemplateSimplifier::getSpecializations()
continue; continue;
// make sure the scopes and names match // make sure the scopes and names match
if (spec.fullName == decl.fullName) { if (spec.fullName() == decl.fullName()) {
// @todo make sure function parameters also match // @todo make sure function parameters also match
mTemplateSpecializationMap[spec.token] = decl.token; mTemplateSpecializationMap[spec.token()] = decl.token();
} }
} }
} }
@ -3160,9 +3167,9 @@ void TemplateSimplifier::getPartialSpecializations()
continue; continue;
// make sure the scopes and names match // make sure the scopes and names match
if (spec.fullName == decl.fullName) { if (spec.fullName() == decl.fullName()) {
// @todo make sure function parameters also match // @todo make sure function parameters also match
mTemplatePartialSpecializationMap[spec.token] = decl.token; mTemplatePartialSpecializationMap[spec.token()] = decl.token();
found = true; found = true;
} }
} }
@ -3173,9 +3180,9 @@ void TemplateSimplifier::getPartialSpecializations()
continue; continue;
// make sure the scopes and names match // make sure the scopes and names match
if (spec.fullName == decl.fullName) { if (spec.fullName() == decl.fullName()) {
// @todo make sure function parameters also match // @todo make sure function parameters also match
mTemplatePartialSpecializationMap[spec.token] = decl.token; mTemplatePartialSpecializationMap[spec.token()] = decl.token();
} }
} }
} }
@ -3189,7 +3196,7 @@ void TemplateSimplifier::fixForwardDeclaredDefaultArgumentValues()
for (const auto & forwardDecl : mTemplateForwardDeclarations) { for (const auto & forwardDecl : mTemplateForwardDeclarations) {
std::vector<const Token *> params1; std::vector<const Token *> params1;
getTemplateParametersInDeclaration(forwardDecl.token->tokAt(2), params1); getTemplateParametersInDeclaration(forwardDecl.token()->tokAt(2), params1);
for (auto & decl : mTemplateDeclarations) { for (auto & decl : mTemplateDeclarations) {
// skip partializations // skip partializations
@ -3198,16 +3205,16 @@ void TemplateSimplifier::fixForwardDeclaredDefaultArgumentValues()
std::vector<const Token *> params2; std::vector<const Token *> params2;
getTemplateParametersInDeclaration(decl.token->tokAt(2), params2); getTemplateParametersInDeclaration(decl.token()->tokAt(2), params2);
// make sure the number of arguments match // make sure the number of arguments match
if (params1.size() == params2.size()) { if (params1.size() == params2.size()) {
// make sure the scopes and names match // make sure the scopes and names match
if (forwardDecl.fullName == decl.fullName) { if (forwardDecl.fullName() == decl.fullName()) {
// save forward declaration for lookup later // save forward declaration for lookup later
if ((decl.nameToken->strAt(1) == "(" && forwardDecl.nameToken->strAt(1) == "(") || if ((decl.nameToken()->strAt(1) == "(" && forwardDecl.nameToken()->strAt(1) == "(") ||
(decl.nameToken->strAt(1) == "{" && forwardDecl.nameToken->strAt(1) == ";")) { (decl.nameToken()->strAt(1) == "{" && forwardDecl.nameToken()->strAt(1) == ";")) {
mTemplateForwardDeclarationsMap[decl.token] = forwardDecl.token; mTemplateForwardDeclarationsMap[decl.token()] = forwardDecl.token();
} }
for (size_t k = 0; k < params1.size(); k++) { for (size_t k = 0; k < params1.size(); k++) {
@ -3229,7 +3236,7 @@ void TemplateSimplifier::fixForwardDeclaredDefaultArgumentValues()
} }
// update parameter end pointer // update parameter end pointer
decl.paramEnd = decl.token->next()->findClosingBracket(); decl.paramEnd(decl.token()->next()->findClosingBracket());
} }
} }
} }
@ -3239,23 +3246,23 @@ void TemplateSimplifier::fixForwardDeclaredDefaultArgumentValues()
void TemplateSimplifier::printOut(const TokenAndName &tokenAndName, const std::string &indent) const void TemplateSimplifier::printOut(const TokenAndName &tokenAndName, const std::string &indent) const
{ {
std::cout << indent << "token: "; std::cout << indent << "token: ";
if (tokenAndName.token) if (tokenAndName.token())
std::cout << "\"" << tokenAndName.token->str() << "\" " << mTokenList.fileLine(tokenAndName.token); std::cout << "\"" << tokenAndName.token()->str() << "\" " << mTokenList.fileLine(tokenAndName.token());
else else
std::cout << "nullptr"; std::cout << "nullptr";
std::cout << std::endl; std::cout << std::endl;
std::cout << indent << "scope: \"" << tokenAndName.scope << "\"" << std::endl; std::cout << indent << "scope: \"" << tokenAndName.scope() << "\"" << std::endl;
std::cout << indent << "name: \"" << tokenAndName.name << "\"" << std::endl; std::cout << indent << "name: \"" << tokenAndName.name() << "\"" << std::endl;
std::cout << indent << "fullName: \"" << tokenAndName.fullName << "\"" << std::endl; std::cout << indent << "fullName: \"" << tokenAndName.fullName() << "\"" << std::endl;
std::cout << indent << "nameToken: "; std::cout << indent << "nameToken: ";
if (tokenAndName.nameToken) if (tokenAndName.nameToken())
std::cout << "\"" << tokenAndName.nameToken->str() << "\" " << mTokenList.fileLine(tokenAndName.nameToken); std::cout << "\"" << tokenAndName.nameToken()->str() << "\" " << mTokenList.fileLine(tokenAndName.nameToken());
else else
std::cout << "nullptr"; std::cout << "nullptr";
std::cout << std::endl; std::cout << std::endl;
std::cout << indent << "paramEnd: "; std::cout << indent << "paramEnd: ";
if (tokenAndName.paramEnd) if (tokenAndName.paramEnd())
std::cout << "\"" << tokenAndName.paramEnd->str() << "\" " << mTokenList.fileLine(tokenAndName.paramEnd); std::cout << "\"" << tokenAndName.paramEnd()->str() << "\" " << mTokenList.fileLine(tokenAndName.paramEnd());
else else
std::cout << "nullptr"; std::cout << "nullptr";
std::cout << std::endl; std::cout << std::endl;
@ -3277,10 +3284,10 @@ void TemplateSimplifier::printOut(const TokenAndName &tokenAndName, const std::s
if (tokenAndName.isVariadic()) if (tokenAndName.isVariadic())
std::cout << " isVariadic"; std::cout << " isVariadic";
std::cout << std::endl; std::cout << std::endl;
if (tokenAndName.token && !tokenAndName.paramEnd && tokenAndName.token->strAt(1) == "<") { if (tokenAndName.token() && !tokenAndName.paramEnd() && tokenAndName.token()->strAt(1) == "<") {
const Token *end = tokenAndName.token->next()->findClosingBracket(); const Token *end = tokenAndName.token()->next()->findClosingBracket();
if (end) { if (end) {
const Token *start = tokenAndName.token->next(); const Token *start = tokenAndName.token()->next();
std::cout << indent << "type: "; std::cout << indent << "type: ";
while (start && start != end) { while (start && start != end) {
std::cout << start->str(); std::cout << start->str();
@ -3288,7 +3295,7 @@ void TemplateSimplifier::printOut(const TokenAndName &tokenAndName, const std::s
} }
std::cout << end->str() << std::endl; std::cout << end->str() << std::endl;
} }
} else if (tokenAndName.isAlias() && tokenAndName.paramEnd) { } else if (tokenAndName.isAlias() && tokenAndName.paramEnd()) {
if (tokenAndName.aliasStartToken()) { if (tokenAndName.aliasStartToken()) {
std::cout << indent << "aliasStartToken: \"" << tokenAndName.aliasStartToken()->str() << "\" " std::cout << indent << "aliasStartToken: \"" << tokenAndName.aliasStartToken()->str() << "\" "
<< mTokenList.fileLine(tokenAndName.aliasStartToken()) << std::endl; << mTokenList.fileLine(tokenAndName.aliasStartToken()) << std::endl;
@ -3322,10 +3329,10 @@ void TemplateSimplifier::printOut(const std::string & text) const
for (const auto & mapItem : mTemplateForwardDeclarationsMap) { for (const auto & mapItem : mTemplateForwardDeclarationsMap) {
unsigned int declIndex = 0; unsigned int declIndex = 0;
for (const auto & decl : mTemplateDeclarations) { for (const auto & decl : mTemplateDeclarations) {
if (mapItem.first == decl.token) { if (mapItem.first == decl.token()) {
unsigned int forwardIndex = 0; unsigned int forwardIndex = 0;
for (const auto & forwardDecl : mTemplateForwardDeclarations) { for (const auto & forwardDecl : mTemplateForwardDeclarations) {
if (mapItem.second == forwardDecl.token) { if (mapItem.second == forwardDecl.token()) {
std::cout << "mTemplateForwardDeclarationsMap[" << mapIndex << "]:" << std::endl; std::cout << "mTemplateForwardDeclarationsMap[" << mapIndex << "]:" << std::endl;
std::cout << " mTemplateDeclarations[" << declIndex std::cout << " mTemplateDeclarations[" << declIndex
<< "] => mTemplateForwardDeclarations[" << forwardIndex << "]" << std::endl; << "] => mTemplateForwardDeclarations[" << forwardIndex << "]" << std::endl;
@ -3343,11 +3350,11 @@ void TemplateSimplifier::printOut(const std::string & text) const
for (const auto & mapItem : mTemplateSpecializationMap) { for (const auto & mapItem : mTemplateSpecializationMap) {
unsigned int decl1Index = 0; unsigned int decl1Index = 0;
for (const auto & decl1 : mTemplateDeclarations) { for (const auto & decl1 : mTemplateDeclarations) {
if (decl1.isSpecialization() && mapItem.first == decl1.token) { if (decl1.isSpecialization() && mapItem.first == decl1.token()) {
bool found = 0; bool found = 0;
unsigned int decl2Index = 0; unsigned int decl2Index = 0;
for (const auto & decl2 : mTemplateDeclarations) { for (const auto & decl2 : mTemplateDeclarations) {
if (mapItem.second == decl2.token) { if (mapItem.second == decl2.token()) {
std::cout << "mTemplateSpecializationMap[" << mapIndex << "]:" << std::endl; std::cout << "mTemplateSpecializationMap[" << mapIndex << "]:" << std::endl;
std::cout << " mTemplateDeclarations[" << decl1Index std::cout << " mTemplateDeclarations[" << decl1Index
<< "] => mTemplateDeclarations[" << decl2Index << "]" << std::endl; << "] => mTemplateDeclarations[" << decl2Index << "]" << std::endl;
@ -3359,7 +3366,7 @@ void TemplateSimplifier::printOut(const std::string & text) const
if (!found) { if (!found) {
decl2Index = 0; decl2Index = 0;
for (const auto & decl2 : mTemplateForwardDeclarations) { for (const auto & decl2 : mTemplateForwardDeclarations) {
if (mapItem.second == decl2.token) { if (mapItem.second == decl2.token()) {
std::cout << "mTemplateSpecializationMap[" << mapIndex << "]:" << std::endl; std::cout << "mTemplateSpecializationMap[" << mapIndex << "]:" << std::endl;
std::cout << " mTemplateDeclarations[" << decl1Index std::cout << " mTemplateDeclarations[" << decl1Index
<< "] => mTemplateForwardDeclarations[" << decl2Index << "]" << std::endl; << "] => mTemplateForwardDeclarations[" << decl2Index << "]" << std::endl;
@ -3378,11 +3385,11 @@ void TemplateSimplifier::printOut(const std::string & text) const
for (const auto & mapItem : mTemplatePartialSpecializationMap) { for (const auto & mapItem : mTemplatePartialSpecializationMap) {
unsigned int decl1Index = 0; unsigned int decl1Index = 0;
for (const auto & decl1 : mTemplateDeclarations) { for (const auto & decl1 : mTemplateDeclarations) {
if (mapItem.first == decl1.token) { if (mapItem.first == decl1.token()) {
bool found = 0; bool found = 0;
unsigned int decl2Index = 0; unsigned int decl2Index = 0;
for (const auto & decl2 : mTemplateDeclarations) { for (const auto & decl2 : mTemplateDeclarations) {
if (mapItem.second == decl2.token) { if (mapItem.second == decl2.token()) {
std::cout << "mTemplatePartialSpecializationMap[" << mapIndex << "]:" << std::endl; std::cout << "mTemplatePartialSpecializationMap[" << mapIndex << "]:" << std::endl;
std::cout << " mTemplateDeclarations[" << decl1Index std::cout << " mTemplateDeclarations[" << decl1Index
<< "] => mTemplateDeclarations[" << decl2Index << "]" << std::endl; << "] => mTemplateDeclarations[" << decl2Index << "]" << std::endl;
@ -3394,7 +3401,7 @@ void TemplateSimplifier::printOut(const std::string & text) const
if (!found) { if (!found) {
decl2Index = 0; decl2Index = 0;
for (const auto & decl2 : mTemplateForwardDeclarations) { for (const auto & decl2 : mTemplateForwardDeclarations) {
if (mapItem.second == decl2.token) { if (mapItem.second == decl2.token()) {
std::cout << "mTemplatePartialSpecializationMap[" << mapIndex << "]:" << std::endl; std::cout << "mTemplatePartialSpecializationMap[" << mapIndex << "]:" << std::endl;
std::cout << " mTemplateDeclarations[" << decl1Index std::cout << " mTemplateDeclarations[" << decl1Index
<< "] => mTemplateForwardDeclarations[" << decl2Index << "]" << std::endl; << "] => mTemplateForwardDeclarations[" << decl2Index << "]" << std::endl;
@ -3503,8 +3510,8 @@ void TemplateSimplifier::simplifyTemplates(
if (iter2->isAlias()) if (iter2->isAlias())
continue; continue;
if (iter1->fullName == iter2->fullName) if (iter1->fullName() == iter2->fullName())
specializations.push_back(iter2->nameToken); specializations.push_back(iter2->nameToken());
} }
const bool instantiated = simplifyTemplateInstantiations( const bool instantiated = simplifyTemplateInstantiations(
@ -3519,21 +3526,21 @@ void TemplateSimplifier::simplifyTemplates(
for (std::list<TokenAndName>::const_iterator it = mInstantiatedTemplates.begin(); it != mInstantiatedTemplates.end(); ++it) { for (std::list<TokenAndName>::const_iterator it = mInstantiatedTemplates.begin(); it != mInstantiatedTemplates.end(); ++it) {
std::list<TokenAndName>::iterator decl; std::list<TokenAndName>::iterator decl;
for (decl = mTemplateDeclarations.begin(); decl != mTemplateDeclarations.end(); ++decl) { for (decl = mTemplateDeclarations.begin(); decl != mTemplateDeclarations.end(); ++decl) {
if (decl->token == it->token) if (decl->token() == it->token())
break; break;
} }
if (decl != mTemplateDeclarations.end()) { if (decl != mTemplateDeclarations.end()) {
if (it->isSpecialization()) { if (it->isSpecialization()) {
// delete the "template < >" // delete the "template < >"
Token * tok = it->token; Token * tok = it->token();
tok->deleteNext(2); tok->deleteNext(2);
tok->deleteThis(); tok->deleteThis();
} else { } else {
// remove forward declaration if found // remove forward declaration if found
auto it1 = mTemplateForwardDeclarationsMap.find(it->token); auto it1 = mTemplateForwardDeclarationsMap.find(it->token());
if (it1 != mTemplateForwardDeclarationsMap.end()) if (it1 != mTemplateForwardDeclarationsMap.end())
removeTemplate(it1->second); removeTemplate(it1->second);
removeTemplate(it->token); removeTemplate(it->token());
} }
mTemplateDeclarations.erase(decl); mTemplateDeclarations.erase(decl);
} }
@ -3543,10 +3550,10 @@ void TemplateSimplifier::simplifyTemplates(
while (!mMemberFunctionsToDelete.empty()) { while (!mMemberFunctionsToDelete.empty()) {
const std::list<TokenAndName>::iterator it = std::find_if(mTemplateDeclarations.begin(), const std::list<TokenAndName>::iterator it = std::find_if(mTemplateDeclarations.begin(),
mTemplateDeclarations.end(), mTemplateDeclarations.end(),
FindToken(mMemberFunctionsToDelete.begin()->token)); FindToken(mMemberFunctionsToDelete.begin()->token()));
// multiple functions can share the same declaration so make sure it hasn't already been deleted // multiple functions can share the same declaration so make sure it hasn't already been deleted
if (it != mTemplateDeclarations.end()) { if (it != mTemplateDeclarations.end()) {
removeTemplate(it->token); removeTemplate(it->token());
mTemplateDeclarations.erase(it); mTemplateDeclarations.erase(it);
} }
mMemberFunctionsToDelete.erase(mMemberFunctionsToDelete.begin()); mMemberFunctionsToDelete.erase(mMemberFunctionsToDelete.begin());
@ -3554,7 +3561,7 @@ void TemplateSimplifier::simplifyTemplates(
// remove explicit instantiations // remove explicit instantiations
for (size_t j = 0; j < mExplicitInstantiationsToDelete.size(); ++j) { for (size_t j = 0; j < mExplicitInstantiationsToDelete.size(); ++j) {
Token * start = mExplicitInstantiationsToDelete[j].token; Token * start = mExplicitInstantiationsToDelete[j].token();
if (start) { if (start) {
Token * end = start->next(); Token * end = start->next();
while (end && end->str() != ";") while (end && end->str() != ";")

152
lib/templatesimplifier.h
View File

@ -69,35 +69,14 @@ public:
/** /**
* Token and its full scopename * Token and its full scopename
*/ */
struct TokenAndName { class TokenAndName {
/** Token *mToken;
* Constructor used for instantiations. std::string mScope;
* \param tok template instantiation name token "name<...>" std::string mName;
* \param s full qualification of template(scope) std::string mFullName;
*/ const Token *mNameToken;
TokenAndName(Token *tok, const std::string &s); const Token *mParamEnd;
/** unsigned int mFlags;
* Constructor used for declarations.
* \param tok template declaration token "template < ... >"
* \param s full qualification of template(scope)
* \param nt template name token "template < ... > class name"
* \param pe template parameter end token ">"
*/
TokenAndName(Token *tok, const std::string &s, const Token *nt, const Token *pe);
TokenAndName(const TokenAndName& otherTok);
~TokenAndName();
bool operator == (const TokenAndName & rhs) const {
return token == rhs.token && scope == rhs.scope && name == rhs.name && fullName == rhs.fullName &&
nameToken == rhs.nameToken && paramEnd == rhs.paramEnd && flags == rhs.flags;
}
Token *token;
std::string scope;
std::string name;
std::string fullName;
const Token *nameToken;
const Token *paramEnd;
unsigned int flags;
enum { enum {
fIsClass = (1 << 0), // class template fIsClass = (1 << 0), // class template
@ -108,60 +87,30 @@ public:
fIsPartialSpecialization = (1 << 5), // user partial specialized template fIsPartialSpecialization = (1 << 5), // user partial specialized template
fIsForwardDeclaration = (1 << 6), // forward declaration fIsForwardDeclaration = (1 << 6), // forward declaration
fIsVariadic = (1 << 7), // variadic template fIsVariadic = (1 << 7), // variadic template
fFamilyMask = (fIsClass | fIsFunction | fIsVariable)
}; };
bool isClass() const {
return getFlag(fIsClass);
}
void isClass(bool state) { void isClass(bool state) {
setFlag(fIsClass, state); setFlag(fIsClass, state);
} }
bool isFunction() const {
return getFlag(fIsFunction);
}
void isFunction(bool state) { void isFunction(bool state) {
setFlag(fIsFunction, state); setFlag(fIsFunction, state);
} }
bool isVariable() const {
return getFlag(fIsVariable);
}
void isVariable(bool state) { void isVariable(bool state) {
setFlag(fIsVariable, state); setFlag(fIsVariable, state);
} }
bool isAlias() const {
return getFlag(fIsAlias);
}
void isAlias(bool state) { void isAlias(bool state) {
setFlag(fIsAlias, state); setFlag(fIsAlias, state);
} }
bool isSpecialization() const {
return getFlag(fIsSpecialization);
}
void isSpecialization(bool state) { void isSpecialization(bool state) {
setFlag(fIsSpecialization, state); setFlag(fIsSpecialization, state);
} }
bool isPartialSpecialization() const {
return getFlag(fIsPartialSpecialization);
}
void isPartialSpecialization(bool state) { void isPartialSpecialization(bool state) {
setFlag(fIsPartialSpecialization, state); setFlag(fIsPartialSpecialization, state);
} }
bool isForwardDeclaration() const {
return getFlag(fIsForwardDeclaration);
}
void isForwardDeclaration(bool state) { void isForwardDeclaration(bool state) {
setFlag(fIsForwardDeclaration, state); setFlag(fIsForwardDeclaration, state);
} }
bool isVariadic() const {
return getFlag(fIsVariadic);
}
void isVariadic(bool state) { void isVariadic(bool state) {
setFlag(fIsVariadic, state); setFlag(fIsVariadic, state);
} }
@ -172,7 +121,7 @@ public:
* @return true if flag set or false in flag not set * @return true if flag set or false in flag not set
*/ */
bool getFlag(unsigned int flag) const { bool getFlag(unsigned int flag) const {
return ((flags & flag) != 0); return ((mFlags & flag) != 0);
} }
/** /**
@ -181,7 +130,80 @@ public:
* @param state new state of flag * @param state new state of flag
*/ */
void setFlag(unsigned int flag, bool state) { void setFlag(unsigned int flag, bool state) {
flags = state ? flags | flag : flags & ~flag; mFlags = state ? mFlags | flag : mFlags & ~flag;
}
public:
/**
* Constructor used for instantiations.
* \param tok template instantiation name token "name<...>"
* \param s full qualification of template(scope)
*/
TokenAndName(Token *token, const std::string &scope);
/**
* Constructor used for declarations.
* \param tok template declaration token "template < ... >"
* \param s full qualification of template(scope)
* \param nt template name token "template < ... > class name"
* \param pe template parameter end token ">"
*/
TokenAndName(Token *token, const std::string &scope, const Token *nameToken, const Token *paramEnd);
TokenAndName(const TokenAndName& other);
~TokenAndName();
bool operator == (const TokenAndName & rhs) const {
return mToken == rhs.mToken && mScope == rhs.mScope && mName == rhs.mName && mFullName == rhs.mFullName &&
mNameToken == rhs.mNameToken && mParamEnd == rhs.mParamEnd && mFlags == rhs.mFlags;
}
Token * token() const {
return mToken;
}
void token(Token * token) {
mToken = token;
}
const std::string & scope() const {
return mScope;
}
const std::string & name() const {
return mName;
}
const std::string & fullName() const {
return mFullName;
}
const Token * nameToken() const {
return mNameToken;
}
const Token * paramEnd() const {
return mParamEnd;
}
void paramEnd(const Token *end) {
mParamEnd = end;
}
bool isClass() const {
return getFlag(fIsClass);
}
bool isFunction() const {
return getFlag(fIsFunction);
}
bool isVariable() const {
return getFlag(fIsVariable);
}
bool isAlias() const {
return getFlag(fIsAlias);
}
bool isSpecialization() const {
return getFlag(fIsSpecialization);
}
bool isPartialSpecialization() const {
return getFlag(fIsPartialSpecialization);
}
bool isForwardDeclaration() const {
return getFlag(fIsForwardDeclaration);
}
bool isVariadic() const {
return getFlag(fIsVariadic);
} }
/** /**
@ -216,9 +238,9 @@ public:
* @return true if same family, false if different family * @return true if same family, false if different family
*/ */
bool isSameFamily(const TemplateSimplifier::TokenAndName &decl) const { bool isSameFamily(const TemplateSimplifier::TokenAndName &decl) const {
// make sure a family flag is set and matches // Make sure a family flag is set and matches.
return (flags & (fIsClass | fIsFunction | fIsVariable)) & // This works because at most only one flag will be set.
(decl.flags & (fIsClass | fIsFunction | fIsVariable)); return (mFlags & fFamilyMask) & (decl.mFlags & (fFamilyMask));
} }
}; };

8
lib/token.cpp
View File

@ -268,11 +268,11 @@ void Token::swapWithNext()
std::swap(mFlags, mNext->mFlags); std::swap(mFlags, mNext->mFlags);
std::swap(mImpl, mNext->mImpl); std::swap(mImpl, mNext->mImpl);
for (auto templateSimplifierPointer : mImpl->mTemplateSimplifierPointers) { for (auto templateSimplifierPointer : mImpl->mTemplateSimplifierPointers) {
templateSimplifierPointer->token = this; templateSimplifierPointer->token(this);
} }
for (auto templateSimplifierPointer : mNext->mImpl->mTemplateSimplifierPointers) { for (auto templateSimplifierPointer : mNext->mImpl->mTemplateSimplifierPointers) {
templateSimplifierPointer->token = mNext; templateSimplifierPointer->token(mNext);
} }
if (mNext->mLink) if (mNext->mLink)
mNext->mLink->mLink = this; mNext->mLink->mLink = this;
@ -291,7 +291,7 @@ void Token::takeData(Token *fromToken)
mImpl = fromToken->mImpl; mImpl = fromToken->mImpl;
fromToken->mImpl = nullptr; fromToken->mImpl = nullptr;
for (auto templateSimplifierPointer : mImpl->mTemplateSimplifierPointers) { for (auto templateSimplifierPointer : mImpl->mTemplateSimplifierPointers) {
templateSimplifierPointer->token = this; templateSimplifierPointer->token(this);
} }
mLink = fromToken->mLink; mLink = fromToken->mLink;
if (mLink) if (mLink)
@ -2000,7 +2000,7 @@ TokenImpl::~TokenImpl()
delete mValues; delete mValues;
for (auto templateSimplifierPointer : mTemplateSimplifierPointers) { for (auto templateSimplifierPointer : mTemplateSimplifierPointers) {
templateSimplifierPointer->token = nullptr; templateSimplifierPointer->token(nullptr);
} }
while (mCppcheckAttributes) { while (mCppcheckAttributes) {