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

Merge pull request #553 from Dmitry-Me/mergeOverlappingPatterns3 

Merge overlapping patterns
This commit is contained in:
amai2012 2015-03-17 18:17:03 +01:00
parent ce95776abc 3ab3715a88
commit 63fc5925bc
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/tokenize.cpp
View File

@ -6067,8 +6067,7 @@ void Tokenizer::simplifyIfNot()
if (!tok) if (!tok)
break; break;
if (Token::Match(tok, "0|false == (") || if (Token::Match(tok, "0|false == %name%|(")) {
Token::Match(tok, "0|false == %name%")) {
tok->deleteNext(); tok->deleteNext();
tok->str("!"); tok->str("!");
} }
@ -6145,8 +6144,7 @@ void Tokenizer::simplifyIfNotNull()
if (!tok) if (!tok)
break; break;
if (Token::simpleMatch(tok, "0 != (") || if (Token::Match(tok, "0 != %name%|(")) {
Token::Match(tok, "0 != %name%")) {
deleteFrom = tok->previous(); deleteFrom = tok->previous();
if (tok->tokAt(2)) if (tok->tokAt(2))
tok->tokAt(2)->isPointerCompare(true); tok->tokAt(2)->isPointerCompare(true);