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

made the Tokenizer::simplifyCasts more generic

This commit is contained in:
Daniel Marjamäki 2009-03-10 21:26:08 +01:00
parent c7c13ce3c1
commit eac29d151c
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/tokenize.cpp
View File

@ -1395,10 +1395,19 @@ bool Tokenizer::simplifyCasts()
bool ret = false; bool ret = false;
for (Token *tok = _tokens; tok; tok = tok->next()) for (Token *tok = _tokens; tok; tok = tok->next())
{ {
if (Token::Match(tok->next(), "( %type% * )") || Token::Match(tok->next(), "( %type% %type% * )")) if (Token::Match(tok->next(), "( %type% *| )") || Token::Match(tok->next(), "( %type% %type% *| )"))
{ {
if (tok->isName() && tok->str() != "return") if (tok->isName() && tok->str() != "return")
continue; continue;
// Is it a cast of some variable?
const Token *tok2 = tok->tokAt(3);
while (tok2 && tok2->str() != ")")
tok2 = tok2->next();
if (!Token::Match(tok2, ") %var%"))
continue;
// Remove cast..
while (tok->next()->str() != ")") while (tok->next()->str() != ")")
tok->deleteNext(); tok->deleteNext();
tok->deleteNext(); tok->deleteNext();

2
test/testsimplifytokens.cpp
View File

@ -327,7 +327,7 @@ private:
ASSERT_EQUALS("if ( a < p ) { ", tok("if(a<(p))")); ASSERT_EQUALS("if ( a < p ) { ", tok("if(a<(p))"));
// keep parantheses.. // keep parantheses..
ASSERT_EQUALS("= ( char ) a ; ", tok("= (char)a;")); ASSERT_EQUALS("= a ; ", tok("= (char)a;"));
ASSERT_EQUALS("cast < char * > ( p ) ", tok("cast<char *>(p)")); ASSERT_EQUALS("cast < char * > ( p ) ", tok("cast<char *>(p)"));
} }