Fixed cppcheck-opensource#2655 (false positive: (warning) Redundant code: Found a statement that begins with numeric constant)

Daniel Marjamäki · Daniel Marjamäki · commit b8cda19ca65b · 2011-03-30T21:57:01.000+02:00
diff --git a/lib/checkother.cpp b/lib/checkother.cpp
@@ -2767,7 +2767,11 @@ void CheckOther::checkIncompleteStatement()
     for (const Token *tok = _tokenizer->tokens(); tok; tok = tok->next())
     {
         if (tok->str() == "(")
+        {
             tok = tok->link();
+            if (Token::simpleMatch(tok, ") {") && Token::simpleMatch(tok->next()->link(), "} ;"))
+                tok = tok->next()->link();
+        }
 
         else if (Token::simpleMatch(tok, "= {"))
             tok = tok->next()->link();
diff --git a/test/testincompletestatement.cpp b/test/testincompletestatement.cpp
@@ -68,6 +68,7 @@ class TestIncompleteStatement : public TestFixture
         TEST_CASE(structarray);
         TEST_CASE(conditionalcall);     // ; 0==x ? X() : Y();
         TEST_CASE(structinit);          // #2462 : ABC abc{1,2,3};
+        TEST_CASE(returnstruct);
     }
 
     void test1()
@@ -192,6 +193,14 @@ class TestIncompleteStatement : public TestFixture
         check("struct A {};");
         ASSERT_EQUALS("", errout.str());
     }
+
+    void returnstruct()
+    {
+        check("struct s foo() {\n"
+              "    return (struct s){0,0};\n"
+              "}");
+        ASSERT_EQUALS("", errout.str());
+    }
 };
 
 REGISTER_TEST(TestIncompleteStatement)
