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

Fixed ticket #348 (Simplify sizeof for pointers) 

https://apps.sourceforge.net/trac/cppcheck/ticket/348
This commit is contained in:
Slava Semushin 2009-06-01 17:01:45 +07:00
parent 3d0926936f
commit 09fce76e30
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/tokenize.cpp
View File

@ -1154,13 +1154,15 @@ void Tokenizer::simplifyTokenList()
// Replace 'sizeof(var)' with 'sizeof(type)'
for (Token *tok = _tokens; tok; tok = tok->next())
{
if (! Token::Match(tok, "[;{}] %type% %var% ;"))
if (! Token::Match(tok, "[;{}] %type% *| %var% ;"))
continue;
if (tok->tokAt(2)->varId() <= 0)
continue;
const int type_tok = (tok->tokAt(2)->str() == "*" ? 2 : 1);
const int varname_tok = type_tok + 1;
const unsigned int varid = tok->tokAt(varname_tok)->varId();
const unsigned int varid = tok->tokAt(2)->varId();
if (varid <= 0)
continue;
int indentlevel = 0;
for (Token *tok2 = tok; tok2; tok2 = tok2->next())
@ -1176,7 +1178,7 @@ void Tokenizer::simplifyTokenList()
else if (Token::Match(tok2, "sizeof ( %varid% )", varid))
{
tok2 = tok2->tokAt(2);
tok2->str(tok->strAt(1));
tok2->str(tok->strAt(type_tok));
}
}
}
@ -1230,13 +1232,19 @@ void Tokenizer::simplifyTokenList()
}
}
if (Token::Match(tok, "sizeof ( %type% * )"))
// sizeof(type *) => sizeof(*)
if (Token::Match(tok, "sizeof ( %type% *)"))
{
tok->next()->deleteNext();
}
if (Token::Match(tok, "sizeof ( * )"))
{
std::ostringstream str;
str << SizeOfType(tok->strAt(3));
str << SizeOfType(tok->strAt(2));
tok->str(str.str().c_str());
for (int i = 0; i < 4; i++)
for (int i = 0; i < 3; i++)
{
tok->deleteNext();
}

2
test/testsimplifytokens.cpp
View File

@ -576,7 +576,7 @@ private:
"}\n";
std::ostringstream oss;
oss << sizeof(void *);
TODO_ASSERT_EQUALS(" void f ( ) { char * ptrs ; int a ; a = " + oss.str() + " ; }", sizeof_(code));
ASSERT_EQUALS(" void f ( ) { char * ptrs ; int a ; a = " + oss.str() + " ; }", sizeof_(code));
}
}