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

CheckClass: The operator< etc member functions can often be const

This commit is contained in:
Daniel Marjamäki 2010-01-23 22:36:04 +01:00
parent 7817d5b142
commit a0d8f44603
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/checkclass.cpp
View File

@ -1406,7 +1406,7 @@ void CheckClass::checkConst()
for (const Token *tok = _tokenizer->tokens(); tok; tok = tok->next()) for (const Token *tok = _tokenizer->tokens(); tok; tok = tok->next())
{ {
if (Token::Match(tok, "class %var% :|{")) if (Token::Match(tok, "class|struct %var% :|{"))
{ {
// get class name.. // get class name..
const std::string classname(tok->strAt(1)); const std::string classname(tok->strAt(1));
@ -1426,19 +1426,24 @@ void CheckClass::checkConst()
break; break;
// member function? // member function?
if (Token::Match(tok2, "[;}] %type% %var% (")) if (Token::Match(tok2, "[;}] %type% %var% (") ||
Token::Match(tok2, "[;}] %type% operator %any% ("))
{ {
// goto function name..
while (tok2->next()->str() != "(")
tok2 = tok2->next();
// get function name // get function name
const std::string functionName(tok2->strAt(2)); const std::string functionName((tok2->isName() ? "" : "operator") + tok2->str());
if (functionName == classname) if (functionName == classname)
continue; continue;
// goto the ')' // goto the ')'
tok2 = tok2->tokAt(3)->link(); tok2 = tok2->next()->link();
if (!tok2) if (!tok2)
break; break;
// is this function implemented inline? // is this a non-const function that is implemented inline?
if (Token::simpleMatch(tok2, ") {")) if (Token::simpleMatch(tok2, ") {"))
{ {
// if the function doesn't have any assignment nor function call, // if the function doesn't have any assignment nor function call,
@ -1466,7 +1471,7 @@ void CheckClass::checkConst()
} }
// function call.. // function call..
else if (Token::Match(tok3, "%var% (")) else if (tok3->str() != "return" && Token::Match(tok3, "%var% ("))
{ {
isconst = false; isconst = false;
break; break;

11
test/testclass.cpp
View File

@ -81,6 +81,7 @@ private:
// can member function be made const // can member function be made const
TEST_CASE(const1); TEST_CASE(const1);
TEST_CASE(const2);
} }
// Check the operator Equal // Check the operator Equal
@ -1555,6 +1556,16 @@ private:
"};\n"); "};\n");
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());
} }
// operator< can often be const
void const2()
{
checkConst("struct Fred {\n"
" int a;\n"
" bool operator<(const Fred &f) { return (a < f.a); }\n"
"};\n");
ASSERT_EQUALS("[test.cpp:3]: (style) The function 'Fred::operator<' can be const\n", errout.str());
}
}; };
REGISTER_TEST(TestClass) REGISTER_TEST(TestClass)