Fixed #2458 (false positive: (warning) Redundant code: Found a statement that begins with numeric constant)

lib/checkother.cpp

@@ -2342,52 +2342,29 @@ void CheckOther::checkIncompleteStatement()
     if (!_settings->_checkCodingStyle)
         return;
 
-    int parlevel = 0;
-
     for (const Token *tok = _tokenizer->tokens(); tok; tok = tok->next())
     {
         if (tok->str() == "(")
-            ++parlevel;
+            tok = tok->link();
-        else if (tok->str() == ")")
-            --parlevel;
 
-        if (parlevel != 0)
+        else if (Token::simpleMatch(tok, "= {"))
+            tok = tok->next()->link();
+
+        else if (Token::Match(tok, "[;{}] %str%") || Token::Match(tok, "[;{}] %num%"))
+        {
+            // bailout if there is a "? :" in this statement
+            bool bailout = false;
+            for (const Token *tok2 = tok->tokAt(2); tok2; tok2 = tok2->next())
+            {
+                if (tok2->str() == "?")
+                    bailout = true;
+                else if (tok2->str() == ";")
+                    break;
+            }
+            if (bailout)
                 continue;
 
-        if (Token::simpleMatch(tok, "= {"))
+            constStatementError(tok->next(), tok->next()->isNumber() ? "numeric" : "string");
-        {
-            /* We are in an assignment, so it's not a statement.
-             * Skip until ";" */
-
-            while (tok->str() != ";")
-            {
-                int level = 0;
-                do
-                {
-                    if (tok->str() == "(" || tok->str() == "{")
-                        ++level;
-                    else if (tok->str() == ")" || tok->str() == "}")
-                        --level;
-
-                    tok = tok->next();
-
-                    if (tok == NULL)
-                        return;
-                }
-                while (level > 0);
-            }
-
-            continue;
-        }
-
-        if (Token::Match(tok, "[;{}] %str%") && !Token::Match(tok->tokAt(2), "[,}]"))
-        {
-            constStatementError(tok->next(), "string");
-        }
-
-        if (Token::Match(tok, "[;{}] %num%") && !Token::Match(tok->tokAt(2), "[,}]"))
-        {
-            constStatementError(tok->next(), "numeric");
         }
     }
 }

test/testincompletestatement.cpp

@@ -66,6 +66,7 @@ private:
         TEST_CASE(intarray);
         TEST_CASE(structarraynull);
         TEST_CASE(structarray);
+        TEST_CASE(conditionalcall);     // ; 0==x ? X() : Y();
     }
 
     void test1()
@@ -170,6 +171,13 @@ private:
         ASSERT_EQUALS("", errout.str());
     }
 
+    void conditionalcall()
+    {
+        check("void f() {\n"
+              "    0==x ? X() : Y();\n"
+              "}\n");
+        ASSERT_EQUALS("", errout.str());
+    }
 };
 
 REGISTER_TEST(TestIncompleteStatement)