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

Merge branch 'master' of git@github.com:danmar/cppcheck

This commit is contained in:
Kimmo Varis 2009-07-18 11:26:15 +03:00
parent 180a04316d 2ccc01f5ed
commit 4622f9891c
2 changed files with 30 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/tokenize.cpp
View File

@ -2434,7 +2434,9 @@ bool Tokenizer::simplifyIfNot()
bool ret = false; bool ret = false;
for (Token *tok = _tokens; tok; tok = tok->next()) for (Token *tok = _tokens; tok; tok = tok->next())
{ {
if (tok->str() == "(" || tok->str() == "||" || tok->str() == "&&")
{
tok = tok->next();
if (Token::simpleMatch(tok, "0 == (") || if (Token::simpleMatch(tok, "0 == (") ||
Token::Match(tok, "0 == %var%")) Token::Match(tok, "0 == %var%"))
{ {
@ -2443,7 +2445,7 @@ bool Tokenizer::simplifyIfNot()
ret = true; ret = true;
} }
if (Token::Match(tok, "%var% == 0")) else if (Token::Match(tok, "%var% == 0"))
{ {
tok->deleteNext(); tok->deleteNext();
tok->next()->str(tok->str()); tok->next()->str(tok->str());
@ -2451,7 +2453,18 @@ bool Tokenizer::simplifyIfNot()
ret = true; ret = true;
} }
if (tok->link() && Token::simpleMatch(tok, ") == 0")) else if (Token::Match(tok, "%var% . %var% == 0"))
{
tok = tok->previous();
tok->insertToken("!");
tok = tok->tokAt(4);
tok->deleteNext();
tok->deleteNext();
ret = true;
}
}
else if (tok->link() && Token::simpleMatch(tok, ") == 0"))
{ {
tok->deleteNext(); tok->deleteNext();
tok->deleteNext(); tok->deleteNext();

2
test/testsimplifytokens.cpp
View File

@ -971,11 +971,13 @@ private:
void ifnot() void ifnot()
{ {
ASSERT_EQUALS("if ( ! x )", simplifyIfNot("if(0==x)")); ASSERT_EQUALS("if ( ! x )", simplifyIfNot("if(0==x)"));
ASSERT_EQUALS("if ( ! x )", simplifyIfNot("if(x==0)"));
ASSERT_EQUALS("if ( ! ( a = b ) )", simplifyIfNot("if(0==(a=b))")); ASSERT_EQUALS("if ( ! ( a = b ) )", simplifyIfNot("if(0==(a=b))"));
ASSERT_EQUALS("if ( ! x )", simplifyIfNot("if(x==0)")); ASSERT_EQUALS("if ( ! x )", simplifyIfNot("if(x==0)"));
ASSERT_EQUALS("if ( ! a && b ( ) )", simplifyIfNot("if( 0 == a && b() )")); ASSERT_EQUALS("if ( ! a && b ( ) )", simplifyIfNot("if( 0 == a && b() )"));
ASSERT_EQUALS("if ( b ( ) && ! a )", simplifyIfNot("if( b() && 0 == a )")); ASSERT_EQUALS("if ( b ( ) && ! a )", simplifyIfNot("if( b() && 0 == a )"));
ASSERT_EQUALS("if ( ! ( a = b ) )", simplifyIfNot("if((a=b)==0)")); ASSERT_EQUALS("if ( ! ( a = b ) )", simplifyIfNot("if((a=b)==0)"));
ASSERT_EQUALS("if ( ! x . y )", simplifyIfNot("if(x.y==0)"));
} }