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

TemplateSimplifier: Remove not needed variable indentlevel

This commit is contained in:
Daniel Marjamäki 2017-12-26 13:27:02 +01:00
parent 6cbd69bf2d
commit 84bdabacf8
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/templatesimplifier.cpp
View File

@ -842,7 +842,6 @@ void TemplateSimplifier::expandTemplate(
else else
continue; continue;
int indentlevel = 0;
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
@ -912,7 +911,6 @@ void TemplateSimplifier::expandTemplate(
// link() newly tokens manually // link() newly tokens manually
else if (tok3->str() == "{") { else if (tok3->str() == "{") {
brackets.push(tokenlist.back()); brackets.push(tokenlist.back());
indentlevel++;
} else if (tok3->str() == "(") { } else if (tok3->str() == "(") {
brackets.push(tokenlist.back()); brackets.push(tokenlist.back());
} else if (tok3->str() == "[") { } else if (tok3->str() == "[") {
@ -925,15 +923,10 @@ void TemplateSimplifier::expandTemplate(
tokenlist.addtoken(tokSemicolon, tokSemicolon->linenr(), tokSemicolon->fileIndex()); tokenlist.addtoken(tokSemicolon, tokSemicolon->linenr(), tokSemicolon->fileIndex());
} }
brackets.pop(); brackets.pop();
if (indentlevel <= 1 && brackets.empty()) { if (brackets.empty()) {
// there is a bug if indentlevel is 0
// the "}" token should only be added if indentlevel is 1 but I add it always intentionally
// if indentlevel ever becomes 0, cppcheck will write:
// ### Error: Invalid number of character {
inTemplateDefinition = false; inTemplateDefinition = false;
break; break;
} }
--indentlevel;
} else if (tok3->str() == ")") { } else if (tok3->str() == ")") {
assert(brackets.empty() == false && brackets.top()->str() == "("); assert(brackets.empty() == false && brackets.top()->str() == "(");
Token::createMutualLinks(brackets.top(), tokenlist.back()); Token::createMutualLinks(brackets.top(), tokenlist.back());