Fixed danmar#5084 (False positive: (style) Same expression on both sides of '&&')

danmar · danmar · commit 5d7e0aebf4ab · 2013-10-19T18:04:53.000+02:00
diff --git a/lib/checkother.cpp b/lib/checkother.cpp
@@ -3063,6 +3063,9 @@ void CheckOther::complexDuplicateExpressionCheck(const std::list<const Function*
                 start = tok1;
                 break;
             }
+
+            if (tok1->isExpandedMacro())
+                break;
         }
         const Token *end = 0;
         level = 0;
@@ -3077,8 +3080,13 @@ void CheckOther::complexDuplicateExpressionCheck(const std::list<const Function*
                 end = tok1;
                 break;
             }
+
+            if (tok1->isExpandedMacro())
+                break;
         }
-        checkExpressionRange(constFunctions, start, end, toCheck);
+
+        if (start && end)
+            checkExpressionRange(constFunctions, start, end, toCheck);
     }
 }
 
diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
@@ -5957,12 +5957,14 @@ void Tokenizer::simplifyIfNotNull()
             else if (Token::Match(tok, "%var% != 0")) {
                 deleteFrom = tok;
                 tok->isPointerCompare(true);
+                tok->isExpandedMacro(tok->isExpandedMacro() || tok->tokAt(2)->isExpandedMacro());
             }
 
             else if (Token::Match(tok, "%var% .|:: %var% != 0")) {
                 tok = tok->tokAt(2);
                 deleteFrom = tok;
                 tok->isPointerCompare(true);
+                tok->isExpandedMacro(tok->isExpandedMacro() || tok->tokAt(2)->isExpandedMacro());
             }
         }
 
diff --git a/test/testother.cpp b/test/testother.cpp
@@ -126,6 +126,7 @@ class TestOther : public TestFixture {
         TEST_CASE(incorrectLogicOperator1);
         TEST_CASE(incorrectLogicOperator2);
         TEST_CASE(incorrectLogicOperator3);
+        TEST_CASE(incorrectLogicOperator4);
         TEST_CASE(secondAlwaysTrueFalseWhenFirstTrueError);
         TEST_CASE(incorrectLogicOp_condSwapping);
         TEST_CASE(sameExpression);
@@ -3982,6 +3983,13 @@ class TestOther : public TestFixture {
                       "[test.cpp:5]: (warning) Logical conjunction always evaluates to false: x <= 1 && x == 3.\n", errout.str());
     }
 
+    void incorrectLogicOperator4() {
+        check("void f(int x) {\n"
+              "  if (x && x != $0) {}\n"
+              "}");
+        ASSERT_EQUALS("", errout.str());
+    }
+
     void secondAlwaysTrueFalseWhenFirstTrueError() {
         check("void f(int x) {\n"
               "    if (x > 5 && x != 1)\n"

Original file line number	Diff line number	Diff line change
`@@ -3063,6 +3063,9 @@ void CheckOther::complexDuplicateExpressionCheck(const std::list<const Function*`
`3063`	`3063`	`start = tok1;`
`3064`	`3064`	`break;`
`3065`	`3065`	`}`
	`3066`	`+`
	`3067`	`+ if (tok1->isExpandedMacro())`
	`3068`	`+ break;`
`3066`	`3069`	`}`
`3067`	`3070`	`const Token *end = 0;`
`3068`	`3071`	`level = 0;`
`@@ -3077,8 +3080,13 @@ void CheckOther::complexDuplicateExpressionCheck(const std::list<const Function*`
`3077`	`3080`	`end = tok1;`
`3078`	`3081`	`break;`
`3079`	`3082`	`}`
	`3083`	`+`
	`3084`	`+ if (tok1->isExpandedMacro())`
	`3085`	`+ break;`
`3080`	`3086`	`}`
`3081`		`- checkExpressionRange(constFunctions, start, end, toCheck);`
	`3087`	`+`
	`3088`	`+ if (start && end)`
	`3089`	`+ checkExpressionRange(constFunctions, start, end, toCheck);`
`3082`	`3090`	`}`
`3083`	`3091`	`}`
`3084`	`3092`
Original file line number	Diff line number	Diff line change
`@@ -5957,12 +5957,14 @@ void Tokenizer::simplifyIfNotNull()`
`5957`	`5957`	`else if (Token::Match(tok, "%var% != 0")) {`
`5958`	`5958`	`deleteFrom = tok;`
`5959`	`5959`	`tok->isPointerCompare(true);`
	`5960`	`+ tok->isExpandedMacro(tok->isExpandedMacro() \|\| tok->tokAt(2)->isExpandedMacro());`
`5960`	`5961`	`}`
`5961`	`5962`
`5962`	`5963`	`else if (Token::Match(tok, "%var% .\|:: %var% != 0")) {`
`5963`	`5964`	`tok = tok->tokAt(2);`
`5964`	`5965`	`deleteFrom = tok;`
`5965`	`5966`	`tok->isPointerCompare(true);`
	`5967`	`+ tok->isExpandedMacro(tok->isExpandedMacro() \|\| tok->tokAt(2)->isExpandedMacro());`
`5966`	`5968`	`}`
`5967`	`5969`	`}`
`5968`	`5970`