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

Tokenizer: Fixed const simplification

This commit is contained in:
Daniel Marjamäki 2010-01-29 19:34:43 +01:00
parent c6263b51b5
commit 53f514fc5c
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/tokenize.cpp
View File

@ -5625,7 +5625,8 @@ void Tokenizer::simplifyConst()
{ {
for (Token *tok = _tokens; tok; tok = tok->next()) for (Token *tok = _tokens; tok; tok = tok->next())
{ {
if (Token::Match(tok, "[;{}(,] %type% const")) if (Token::Match(tok, "[;{}(,] %type% const") &&
tok->next()->str().find(":") == std::string::npos)
{ {
tok->tokAt(2)->str(tok->tokAt(1)->str()); tok->tokAt(2)->str(tok->tokAt(1)->str());
tok->tokAt(1)->str("const"); tok->tokAt(1)->str("const");

17
test/testtokenize.cpp
View File

@ -42,6 +42,7 @@ private:
TEST_CASE(tokenize1); TEST_CASE(tokenize1);
TEST_CASE(tokenize2); TEST_CASE(tokenize2);
TEST_CASE(tokenize3); TEST_CASE(tokenize3);
TEST_CASE(tokenize4);
// don't freak out when the syntax is wrong // don't freak out when the syntax is wrong
TEST_CASE(wrong_syntax); TEST_CASE(wrong_syntax);
@ -259,6 +260,22 @@ private:
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());
} }
void tokenize4()
{
errout.str("");
const std::string code("class foo\n"
"{\n"
"public:\n"
" const int i;\n"
"}");
ASSERT_EQUALS("class foo\n"
"{\n"
"public:\n"
"const int i ;\n"
"}", tokenizeAndStringify(code.c_str()));
ASSERT_EQUALS("", errout.str());
}
void wrong_syntax() void wrong_syntax()
{ {
errout.str(""); errout.str("");