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

stl: checking that iterator is used against a single container

This commit is contained in:
Daniel Marjamäki 2009-04-29 20:16:04 +02:00
parent 2a200cff00
commit ad4c7993d1
2 changed files with 34 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/checkstl.cpp
View File

@ -40,30 +40,28 @@ void CheckStl::iterators()
{ {
for (const Token *tok = _tokenizer->tokens(); tok; tok = tok->next()) for (const Token *tok = _tokenizer->tokens(); tok; tok = tok->next())
{ {
// it = foo.begin(); it != bar.end() if (Token::Match(tok, "%var% = %var% . begin ( ) ;"))
if (Token::Match(tok, "%var% = %var% . begin ( ) ; %var% != %var% . end ( ) ;"))
{ {
// Different iterators.. const unsigned int iteratorId(tok->varId());
if (tok->str() != tok->tokAt(8)->str()) const unsigned int containerId(tok->tokAt(2)->varId());
continue; if (iteratorId == 0 || containerId == 0)
// Same container..
if (tok->tokAt(2)->str() == tok->tokAt(10)->str())
continue;
iteratorsError(tok, tok->strAt(2), tok->strAt(10));
}
// it = foo.begin();
// while (it != bar.end())
if (Token::Match(tok, "%var% = %var% . begin ( ) ; while ( %var% != %var% . end ( )"))
{
// Different iterators..
if (tok->str() != tok->tokAt(10)->str())
continue;
// Same container..
if (tok->tokAt(2)->str() == tok->tokAt(12)->str())
continue; continue;
iteratorsError(tok, tok->strAt(2), tok->strAt(12)); for (const Token *tok2 = tok->tokAt(6); tok2; tok2 = tok2->next())
{
if (tok2->str() == "}")
break;
if (tok2->varId() == iteratorId)
{
if (Token::Match(tok2->next(), "!= %var% . end ( )") && tok2->tokAt(2)->varId() != containerId)
iteratorsError(tok2, tok->strAt(2), tok2->strAt(2));
}
else if (Token::Match(tok2, "%var% . insert|erase ( %varid%", iteratorId))
{
if (tok2->varId() != containerId)
iteratorsError(tok2, tok->strAt(2), tok2->str());
}
}
} }
} }
} }

24
test/teststl.cpp
View File

@ -76,35 +76,41 @@ private:
void iterator1() void iterator1()
{ {
check("void foo()\n" check("void f()\n"
"{\n" "{\n"
" for (it = foo.begin(); it != bar.end(); ++it)\n" " list<int> l1;\n"
" list<int> l2;\n"
" for (list<int>::iterator it = l1.begin(); it != l2.end(); ++it)\n"
" { }\n" " { }\n"
"}\n"); "}\n");
ASSERT_EQUALS("[test.cpp:3]: (error) Same iterator is used with both foo and bar\n", errout.str()); ASSERT_EQUALS("[test.cpp:5]: (error) Same iterator is used with both l1 and l2\n", errout.str());
} }
void iterator2() void iterator2()
{ {
check("void foo()\n" check("void foo()\n"
"{\n" "{\n"
" it = foo.begin();\n" " list<int> l1;\n"
" while (it != bar.end())\n" " list<int> l2;\n"
" list<int>::iterator it = l1.begin();\n"
" while (it != l2.end())\n"
" {\n" " {\n"
" ++it;\n" " ++it;\n"
" }\n" " }\n"
"}\n"); "}\n");
ASSERT_EQUALS("[test.cpp:3]: (error) Same iterator is used with both foo and bar\n", errout.str()); ASSERT_EQUALS("[test.cpp:6]: (error) Same iterator is used with both l1 and l2\n", errout.str());
} }
void iterator3() void iterator3()
{ {
check("void foo()\n" check("void foo()\n"
"{\n" "{\n"
" i = l1.begin();\n" " list<int> l1;\n"
" l2.insert(i, 0);\n" " list<int> l2;\n"
" list<int>::iterator it = l1.begin();\n"
" l2.insert(it, 0);\n"
"}\n"); "}\n");
TODO_ASSERT_EQUALS("[test.cpp:4]: (error) Same iterator is used with both foo and bar\n", errout.str()); ASSERT_EQUALS("[test.cpp:6]: (error) Same iterator is used with both l1 and l2\n", errout.str());
} }