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

const class functions: refactorings

This commit is contained in:
Daniel Marjamäki 2010-01-24 13:45:56 +01:00
parent b4b97e5706
commit 25ba399a50
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
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|struct %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));
@ -1425,9 +1425,17 @@ void CheckClass::checkConst()
else if (tok2->str() == "}") else if (tok2->str() == "}")
break; break;
// start of statement?
if (!Token::Match(tok2->previous(), "[;{}]"))
continue;
// skip private: public: etc
if (tok2->isName() && tok2->str().find(":") != std::string::npos)
tok2 = tok2->next();
// member function? // member function?
if (Token::Match(tok2, "[;}] %type% %var% (") || if (Token::Match(tok2, "%type% %var% (") ||
Token::Match(tok2, "[;}] %type% operator %any% (")) Token::Match(tok2, "%type% operator %any% ("))
{ {
// goto function name.. // goto function name..
while (tok2->next()->str() != "(") while (tok2->next()->str() != "(")