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

Robert Reif: Fixed #1163 (post increment test broken for complex template types)

This commit is contained in:
Daniel Marjamäki 2009-12-29 19:24:48 +01:00
parent 160f795710
commit 71b328d703
2 changed files with 65 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
lib/tokenize.cpp
View File

@ -1426,20 +1426,59 @@ void Tokenizer::setVarId()
// Skip template arguments.. // Skip template arguments..
if (Token::Match(tok, "%type% <")) if (Token::Match(tok, "%type% <"))
{ {
int level = 1;
bool again;
Token *tok2 = tok->tokAt(2); Token *tok2 = tok->tokAt(2);
while (Token::Match(tok2, "%var% ::")) do // Look for start of templates or template arguments
tok2 = tok2->tokAt(2); {
again = false;
while (tok2 && (tok2->isName() || tok2->isNumber() || tok2->str() == "*" || tok2->str() == ",")) while (Token::Match(tok2, "%var% ::"))
tok2 = tok2->next(); tok2 = tok2->tokAt(2);
if (Token::Match(tok2, "> %var%")) if (Token::Match(tok2, "%type% <"))
tok = tok2; {
else if (Token::Match(tok2, "> ::|*|& %var%")) level++;
tok = tok2->next(); tok2 = tok2->tokAt(2);
else again = true;
continue; // Not code that I understand / not a variable declaration }
else if (Token::Match(tok2, "%type% ,"))
{
tok2 = tok2->tokAt(2);
again = true;
}
else
{
while (tok2 && (tok2->isName() || tok2->isNumber() || tok2->str() == "*" || tok2->str() == ","))
tok2 = tok2->next();
}
}
while (again);
do // Look for end of templates
{
again = false;
if (level == 1 && Token::Match(tok2, "> %var%"))
tok = tok2;
else if (level > 1 && tok2->str() == ">")
{
level--;
if (level == 0)
tok = tok2;
else
{
tok2 = tok2->tokAt(1);
again = true;
}
}
else if (level == 1 && Token::Match(tok2, "> ::|*|& %var%"))
tok = tok2->next();
else
continue; // Not code that I understand / not a variable declaration
}
while (again);
} }
// Determine name of declared variable.. // Determine name of declared variable..

16
test/testother.cpp
View File

@ -1550,6 +1550,22 @@ private:
"}\n"); "}\n");
ASSERT_EQUALS("[test.cpp:4]: (possible style) Pre-Decrementing variable 'it' is preferred to Post-Decrementing\n" ASSERT_EQUALS("[test.cpp:4]: (possible style) Pre-Decrementing variable 'it' is preferred to Post-Decrementing\n"
"[test.cpp:6]: (possible style) Pre-Decrementing variable 'it' is preferred to Post-Decrementing\n", errout.str()); "[test.cpp:6]: (possible style) Pre-Decrementing variable 'it' is preferred to Post-Decrementing\n", errout.str());
checkpostIncrementDecrement("void f1()\n"
"{\n"
" std::list<std::vector<int> >::iterator it;\n"
" for (it = ab.begin(); it != ab.end(); it++)\n"
" ;\n"
"}\n");
ASSERT_EQUALS("[test.cpp:4]: (possible style) Pre-Incrementing variable 'it' is preferred to Post-Incrementing\n", errout.str());
checkpostIncrementDecrement("void f1()\n"
"{\n"
" std::map<int, std::vector<int> >::iterator it;\n"
" for (it = ab.begin(); it != ab.end(); it++)\n"
" ;\n"
"}\n");
ASSERT_EQUALS("[test.cpp:4]: (possible style) Pre-Incrementing variable 'it' is preferred to Post-Incrementing\n", errout.str());
} }
void postIncrementDecrementClass() void postIncrementDecrementClass()