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

Fixed #1519 (false negative: the function can be declared as const)

This commit is contained in:
Robert Reif 2010-03-26 20:14:31 +01:00 committed by Daniel Marjamäki
parent 45865f54a8
commit 2eceaaefc0
2 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/checkclass.cpp
View File

@ -1581,8 +1581,12 @@ void CheckClass::checkConst()
if (Token::Match(tok2, "%type% %var% (") || if (Token::Match(tok2, "%type% %var% (") ||
Token::Match(tok2, "%type% %type% %var% (") || Token::Match(tok2, "%type% %type% %var% (") ||
Token::Match(tok2, "%type% :: %type% %var% (") || Token::Match(tok2, "%type% :: %type% %var% (") ||
Token::Match(tok2, "%type% :: %type% < %type% > %var% (") ||
Token::Match(tok2, "%type% :: %type% < %type% , %type% > %var% (") ||
Token::Match(tok2, "const %type% &|* %var% (") || Token::Match(tok2, "const %type% &|* %var% (") ||
Token::Match(tok2, "const %type% :: %type% &|*| %var% (") || Token::Match(tok2, "const %type% :: %type% &|*| %var% (") ||
Token::Match(tok2, "const %type% :: %type% < %type% > *|& %var% (") ||
Token::Match(tok2, "const %type% :: %type% < %type% , %type% > *|& %var% (") ||
Token::Match(tok2, "%type% operator %any% (")) Token::Match(tok2, "%type% operator %any% ("))
{ {
// goto function name.. // goto function name..

29
test/testclass.cpp
View File

@ -99,6 +99,7 @@ private:
TEST_CASE(const10); // ticket #1522 TEST_CASE(const10); // ticket #1522
TEST_CASE(const11); // ticket #1529 TEST_CASE(const11); // ticket #1529
TEST_CASE(const12); // ticket #1552 TEST_CASE(const12); // ticket #1552
TEST_CASE(const13); // ticket #1519
TEST_CASE(constoperator); // operator< can often be const TEST_CASE(constoperator); // operator< can often be const
TEST_CASE(constincdec); // increment/decrement => non-const TEST_CASE(constincdec); // increment/decrement => non-const
TEST_CASE(constReturnReference); TEST_CASE(constReturnReference);
@ -2242,6 +2243,34 @@ private:
ASSERT_EQUALS("[test.cpp:3]: (style) The function 'A::foo' can be const\n", errout.str()); ASSERT_EQUALS("[test.cpp:3]: (style) The function 'A::foo' can be const\n", errout.str());
} }
void const13()
{
// ticket #1519
checkConst("class A {\n"
"public:\n"
" A(){}\n"
" std::vector<int> GetVec() {return m_vec;}\n"
" std::pair<int,double> GetPair() {return m_pair;}\n"
"private:\n"
" std::vector<int> m_vec;\n"
" std::pair<int,double> m_pair;\n"
"}");
ASSERT_EQUALS("[test.cpp:4]: (style) The function 'A::GetVec' can be const\n"
"[test.cpp:5]: (style) The function 'A::GetPair' can be const\n", errout.str());
checkConst("class A {\n"
"public:\n"
" A(){}\n"
" const std::vector<int> & GetVec() {return m_vec;}\n"
" const std::pair<int,double> & GetPair() {return m_pair;}\n"
"private:\n"
" std::vector<int> m_vec;\n"
" std::pair<int,double> m_pair;\n"
"}");
ASSERT_EQUALS("[test.cpp:4]: (style) The function 'A::GetVec' can be const\n"
"[test.cpp:5]: (style) The function 'A::GetPair' can be const\n", errout.str());
}
// increment/decrement => not const // increment/decrement => not const
void constincdec() void constincdec()
{ {