Merge pull request cppcheck-opensource#553 from Dmitry-Me/mergeOverlappingPatterns3

amai2012 · amai2012 · commit 63fc5925bc16 · 2015-03-17T18:17:03.000+01:00
Merge overlapping patterns
diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
@@ -6067,8 +6067,7 @@ void Tokenizer::simplifyIfNot()
             if (!tok)
                 break;
 
-            if (Token::Match(tok, "0|false == (") ||
-                Token::Match(tok, "0|false == %name%")) {
+            if (Token::Match(tok, "0|false == %name%|(")) {
                 tok->deleteNext();
                 tok->str("!");
             }
@@ -6145,8 +6144,7 @@ void Tokenizer::simplifyIfNotNull()
             if (!tok)
                 break;
 
-            if (Token::simpleMatch(tok, "0 != (") ||
-                Token::Match(tok, "0 != %name%")) {
+            if (Token::Match(tok, "0 != %name%|(")) {
                 deleteFrom = tok->previous();
                 if (tok->tokAt(2))
                     tok->tokAt(2)->isPointerCompare(true);
