Fix false positive AssignmentIntegerToAddress (danmar#2971)

Ken-Patrick · web-flow · commit aad723bf3a6b · 2020-12-24T19:57:02.000+01:00
diff --git a/lib/symboldatabase.cpp b/lib/symboldatabase.cpp
@@ -5912,6 +5912,9 @@ static const Token * parsedecl(const Token *type, ValueType * const valuetype, V
                 }
                 type = type->next();
             }
+            if (type->str() == "(" && type->previous()->function())
+                // we are past the end of the type
+                type = type->previous();
             continue;
         } else if (settings->library.isSmartPointer(type)) {
             const Token* argTok = Token::findsimplematch(type, "<");
diff --git a/test/test64bit.cpp b/test/test64bit.cpp
@@ -48,6 +48,7 @@ class Test64BitPortability : public TestFixture {
 
         // Tokenize..
         Tokenizer tokenizer(&settings, this);
+        LOAD_LIB_2(settings.library, "std.cfg");
         std::istringstream istr(code);
         tokenizer.tokenize(istr, "test.cpp");
 
@@ -104,6 +105,32 @@ class Test64BitPortability : public TestFixture {
               "    return a;\n"
               "}");
         ASSERT_EQUALS("", errout.str());
+
+        check("std::array<int,2> f();\n"
+              "void g() {\n"
+              "    std::array<int, 2> a = f();\n"
+              "}");
+        ASSERT_EQUALS("", errout.str());
+
+        check("std::array<int,2> f(int x);\n"
+              "void g(int i) {\n"
+              "    std::array<int, 2> a = f(i);\n"
+              "}");
+        ASSERT_EQUALS("", errout.str());
+
+        check("typedef std::array<int, 2> Array;\n"
+              "Array f(int x);\n"
+              "void g(int i) {\n"
+              "    Array a = f(i);\n"
+              "}");
+        ASSERT_EQUALS("", errout.str());
+
+        check("typedef std::array<int, 2> Array;\n"
+              "Array f();\n"
+              "void g(int i) {\n"
+              "    Array a = f();\n"
+              "}");
+        ASSERT_EQUALS("", errout.str());
     }
 
     void structmember() {
diff --git a/test/testsymboldatabase.cpp b/test/testsymboldatabase.cpp

Original file line number	Diff line number	Diff line change
`@@ -5912,6 +5912,9 @@ static const Token * parsedecl(const Token type, ValueType const valuetype, V`
`5912`	`5912`	`}`
`5913`	`5913`	`type = type->next();`
`5914`	`5914`	`}`
	`5915`	`+ if (type->str() == "(" && type->previous()->function())`
	`5916`	`+ // we are past the end of the type`
	`5917`	`+ type = type->previous();`
`5915`	`5918`	`continue;`
`5916`	`5919`	`} else if (settings->library.isSmartPointer(type)) {`
`5917`	`5920`	`const Token* argTok = Token::findsimplematch(type, "<");`