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

partial fix for #2867 handle derived class

This commit is contained in:
Robert Reif 2011-06-29 19:39:19 -04:00
parent 7af920a70b
commit 443dd4c392
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/tokenize.cpp
View File

@ -4721,8 +4721,18 @@ void Tokenizer::removeRedundantAssignment()
const Token * const end = tok->next()->link(); const Token * const end = tok->next()->link();
for (Token *tok2 = tok->next(); tok2 && tok2 != end; tok2 = tok2->next()) for (Token *tok2 = tok->next(); tok2 && tok2 != end; tok2 = tok2->next())
{ {
if (Token::Match(tok2, "class|struct %type% {")) // skip local class or struct
tok2 = tok2->tokAt(2)->link(); // skip local class or struct if (Token::Match(tok2, "class|struct %type% {|:"))
{
// skip to '{'
while (tok2 && tok2->str() != "{")
tok2 = tok2->next();
if (tok2)
tok2 = tok2->link(); // skip local class or struct
else
return;
}
else if (Token::Match(tok2, "[;{}] %type% * %var% ;") && tok2->strAt(1) != "return") else if (Token::Match(tok2, "[;{}] %type% * %var% ;") && tok2->strAt(1) != "return")
{ {
tok2 = tok2->tokAt(3); tok2 = tok2->tokAt(3);

10
test/testclass.cpp
View File

@ -2222,6 +2222,16 @@ private:
" } obj;\n" " } obj;\n"
"};\n"); "};\n");
ASSERT_EQUALS("[test.cpp:4]: (warning) Member variable 'LocalClass::bitsInData_' is not initialized in the constructor.\n", errout.str()); ASSERT_EQUALS("[test.cpp:4]: (warning) Member variable 'LocalClass::bitsInData_' is not initialized in the constructor.\n", errout.str());
checkUninitVar("Object::MemFunc() {\n"
" class LocalClass : public copy_protected {\n"
" public:\n"
" LocalClass() : copy_protected(1), dataLength_(0) {}\n"
" std::streamsize dataLength_;\n"
" double bitsInData_;\n"
" } obj;\n"
"};\n");
ASSERT_EQUALS("[test.cpp:4]: (warning) Member variable 'LocalClass::bitsInData_' is not initialized in the constructor.\n", errout.str());
} }
void uninitVarArray1() void uninitVarArray1()