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

Refactorization: Use Token::link() when stringifying template argument list in symboldatabase.cpp

This commit is contained in:
PKEuS 2015-01-09 22:03:43 +01:00
parent 4da314b2e4
commit d110d715ba
1 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/symboldatabase.cpp
View File

@ -1865,30 +1865,17 @@ const Token *Type::initBaseInfo(const Token *tok, const Token *tok1)
base.name = tok2->str(); base.name = tok2->str();
tok2 = tok2->next();
// add unhandled templates // add unhandled templates
if (tok2->next() && tok2->next()->str() == "<") { if (tok2 && tok2->link() && tok2->str() == "<") {
tok2 = tok2->next(); for (const Token* const end = tok2->link()->next(); tok2 != end; tok2 = tok2->next()) {
base.name += tok2->str(); base.name += tok2->str();
int level1 = 1;
while (tok2->next()) {
base.name += tok2->next()->str();
if (tok2->next()->str() == ">") {
level1--;
if (level1 == 0)
break;
} else if (tok2->next()->str() == "<")
level1++;
tok2 = tok2->next();
} }
} }
// save pattern for base class name // save pattern for base class name
derivedFrom.push_back(base); derivedFrom.push_back(base);
} } else
if (tok2) // see #4806
tok2 = tok2->next(); tok2 = tok2->next();
} }