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

Make use of Token::findClosingBracket in templatesimplifier.cpp

This commit is contained in:
PKEuS 2012-04-18 16:16:06 +02:00
parent cb064dc20e
commit cb7537418a
1 changed files with 2 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
lib/templatesimplifier.cpp
View File

@ -405,38 +405,7 @@ std::list<Token *> TemplateSimplifier::simplifyTemplatesGetTemplateInstantiation
for (Token *tok = tokens; tok; tok = tok->next()) { for (Token *tok = tokens; tok; tok = tok->next()) {
// template definition.. skip it // template definition.. skip it
if (Token::simpleMatch(tok, "template <")) { if (Token::simpleMatch(tok, "template <")) {
unsigned int level = 0; tok->next()->findClosingBracket(tok);
// Goto the end of the template definition
for (; tok; tok = tok->next()) {
// skip '<' .. '>'
if (tok->str() == "<")
++level;
else if (tok->str() == ">") {
if (level <= 1)
break;
--level;
}
// skip inner '(' .. ')' and '{' .. '}'
else if (tok->str() == "{" || tok->str() == "(") {
// skip inner tokens. goto ')' or '}'
tok = tok->link();
// this should be impossible. but break out anyway
if (!tok)
break;
// the end '}' for the template definition => break
if (tok->str() == "}")
break;
}
// the end ';' for the template definition
else if (tok->str() == ";") {
break;
}
}
if (!tok) if (!tok)
break; break;
} else if (Token::Match(tok->previous(), "[({};=] %var% <") || } else if (Token::Match(tok->previous(), "[({};=] %var% <") ||
@ -445,18 +414,7 @@ std::list<Token *> TemplateSimplifier::simplifyTemplatesGetTemplateInstantiation
// Add inner template instantiations first => go to the ">" // Add inner template instantiations first => go to the ">"
// and then parse backwards, adding all seen instantiations // and then parse backwards, adding all seen instantiations
const Token *tok2; const Token *tok2;
tok->next()->findClosingBracket(tok2);
// goto end ">" token
unsigned int level = 0;
for (tok2 = tok; tok2; tok2 = tok2->next()) {
if (tok2->str() == "<") {
++level;
} else if (tok2->str() == ">") {
if (level <= 1)
break;
--level;
}
}
// parse backwards and add template instantiations // parse backwards and add template instantiations
for (; tok2 && tok2 != tok; tok2 = tok2->previous()) { for (; tok2 && tok2 != tok; tok2 = tok2->previous()) {