CheckBool: Fixed false positives for non-bool expressions that contain ! operator

danmar · danmar · commit 83f9503839c7 · 2013-10-07T16:37:51.000+02:00
diff --git a/lib/checkbool.cpp b/lib/checkbool.cpp
@@ -378,9 +378,11 @@ static bool isNonBoolLHSExpr(const Token *tok)
             nonBoolExpr = true;
         else if (tok->varId() && isNonBoolStdType(tok->variable()))
             nonBoolExpr = true;
-        else if (tok->isArithmeticalOp())
+        else if (tok->isArithmeticalOp()) {
+            if (indentlevel == 0)
+                return true;
             nonBoolExpr = true;
-        else if (tok->isComparisonOp() || (tok->str() == "!" && tok->previous()->str()=="("))
+        } else if (tok->isComparisonOp() || (tok->str() == "!" && tok->previous()->str()=="("))
             return false;
         else if (indentlevel == 0 && Token::Match(tok,"[;{}=?:&|^,]"))
             break;
@@ -425,7 +427,7 @@ void CheckBool::checkComparisonOfBoolExpressionWithInt()
                     op = opTok->str()[0]=='>'?'<':'>';
             }
 
-            else if (Token::Match(tok, "! %var% %comp% %any%")) {
+            else if (Token::Match(tok, "! %var% %comp% %any%") && !isNonBoolLHSExpr(tok)) {
                 numTok = tok->tokAt(3);
                 opTok = tok->tokAt(2);
                 if (Token::Match(opTok, "<|>"))
diff --git a/test/testbool.cpp b/test/testbool.cpp
@@ -307,8 +307,11 @@ class TestBool : public TestFixture {
               "}");
         ASSERT_EQUALS("", errout.str());
 
-		check("int f() { return !a+b<c; }");
-		ASSERT_EQUALS("",errout.str());
+        check("int f() { return !a+b<c; }"); // #5072
+        ASSERT_EQUALS("",errout.str());
+
+        check("int f() { return (!a+b<c); }");
+        ASSERT_EQUALS("",errout.str());
     }
 
     void comparisonOfBoolExpressionWithInt2() {
@@ -377,6 +380,9 @@ class TestBool : public TestFixture {
               "  return (x()+1 == !a);\n"
               "}");
         TODO_ASSERT_EQUALS("error", "", errout.str());
+
+        check("void f() { if (!!a+!!b+!!c>1){} }");
+        ASSERT_EQUALS("",errout.str());
     }
 
     void comparisonOfBoolExpressionWithInt3() {
