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

Check misused scope object does not pick local class method. 

Also fixed mistyped withinFuntion ->withinFunction.
This commit is contained in:
Pete Johns 2010-10-02 20:12:52 +10:00
parent 0017655f55
commit 3f72d3a877
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/checkother.cpp
View File

@ -3861,13 +3861,13 @@ bool CheckOther::isIdentifierObjectType(const Token * const tok)
void CheckOther::checkMisusedScopedObject() void CheckOther::checkMisusedScopedObject()
{ {
bool withinFuntion = false; bool withinFunction = false;
unsigned int depth = 0; unsigned int depth = 0;
for (const Token *tok = _tokenizer->tokens(); tok; tok = tok->next()) for (const Token *tok = _tokenizer->tokens(); tok; tok = tok->next())
{ {
withinFuntion |= Token::Match(tok, ") const| {"); withinFunction |= Token::Match(tok, ") const| {");
if (withinFuntion) if (withinFunction)
{ {
if (tok->str() == "{") if (tok->str() == "{")
{ {
@ -3876,10 +3876,14 @@ void CheckOther::checkMisusedScopedObject()
else if (tok->str() == "}") else if (tok->str() == "}")
{ {
--depth; --depth;
withinFuntion &= depth > 0; withinFunction &= depth > 0;
}
else if (Token::Match(tok, "class|struct"))
{
withinFunction = false;
} }
if (withinFuntion && Token::Match(tok, "[;{}] %var% (") && isIdentifierObjectType(tok)) if (withinFunction && Token::Match(tok, "[;{}] %var% (") && isIdentifierObjectType(tok))
{ {
tok = tok->next(); tok = tok->next();
misusedScopeObjectError(tok, tok->str()); misusedScopeObjectError(tok, tok->str());

12
test/testother.cpp
View File

@ -112,6 +112,7 @@ private:
TEST_CASE(testMisusedScopeObjectDoesNotPickIf); TEST_CASE(testMisusedScopeObjectDoesNotPickIf);
TEST_CASE(testMisusedScopeObjectDoesNotPickConstructorDeclaration); TEST_CASE(testMisusedScopeObjectDoesNotPickConstructorDeclaration);
TEST_CASE(testMisusedScopeObjectDoesNotPickFunctor); TEST_CASE(testMisusedScopeObjectDoesNotPickFunctor);
TEST_CASE(testMisusedScopeObjectDoesNotPickLocalClassMethod);
} }
void check(const char code[]) void check(const char code[])
@ -3126,6 +3127,17 @@ private:
); );
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());
} }
void testMisusedScopeObjectDoesNotPickLocalClassMethod()
{
check("void f() {\n"
" class Foo {\n"
" Foo() { }\n"
" };\n"
"}\n"
);
ASSERT_EQUALS("", errout.str());
}
}; };
REGISTER_TEST(TestOther) REGISTER_TEST(TestOther)