Fix #14634: Inconsistent AST for array declarations

lib/tokenlist.cpp

@@ -1837,8 +1837,11 @@
             }
             typetok = typetok->next();
         }
-        if (Token::Match(typetok, "%var% [={]"))
+        if (Token::Match(typetok, "%var% =|{|[")) {
             tok = typetok;
+            while (Token::Match(tok->tokAt(-2), "%name% ::"))
+                tok = tok->tokAt(-2);
+        }
 
         // Do not create AST for function declaration
         if (typetok &&

lib/vf_settokenvalue.cpp

@@ -220,7 +220,8 @@ namespace ValueFlow
     void setTokenValue(Token* tok,
                        Value value,
                        const Settings& settings,
-                       SourceLocation loc)
+                       SourceLocation loc,
+                       bool recurseNamespaces)
     {
         // Skip setting values that are too big since its ambiguous
         if (!value.isImpossible() && value.isIntValue() && value.intvalue < 0 && astIsUnsigned(tok)
@@ -237,6 +238,14 @@ namespace ValueFlow
         if (!tok->addValue(value))
             return;
 
+        if (Token::simpleMatch(tok, "::") && recurseNamespaces) {
+            Token *inner = tok;
+            while (Token::simpleMatch(inner, "::"))
+                inner = inner->astOperand2();
+            if (inner)
+                setTokenValue(inner, value, settings, SourceLocation::current(), false);
+        }
+
         if (value.path < 0)
             return;
 
@@ -701,8 +710,8 @@ namespace ValueFlow
             }
         }
 
-        else if (Token::Match(parent, ":: %name%") && parent->astOperand2() == tok) {
-            setTokenValue(parent, std::move(value), settings);
+        else if (Token::Match(parent, ":: %name%") && parent->astOperand2() == tok && recurseNamespaces) {
+            setTokenValue(parent, std::move(value), settings, SourceLocation::current(), false);
         }
 
         // Calling std::size or std::empty on an array

lib/vf_settokenvalue.h

@@ -30,7 +30,8 @@ namespace ValueFlow
     void setTokenValue(Token* tok,
                        Value value,
                        const Settings& settings,
-                       SourceLocation loc = SourceLocation::current());
+                       SourceLocation loc = SourceLocation::current(),
+                       bool recurseNamespaces = true);
 }
 
 #endif // vfSetTokenValueH

test/testtokenize.cpp

@@ -440,6 +440,7 @@ class TestTokenizer : public TestFixture {
         TEST_CASE(astfuncdecl);
         TEST_CASE(astarrayinit);
         TEST_CASE(astbracedinit);
+        TEST_CASE(astarrayofptrs);
 
         TEST_CASE(startOfExecutableScope);
 
@@ -7543,6 +7544,11 @@ class TestTokenizer : public TestFixture {
         ASSERT_EQUALS("anullptr{", testAst("int *a { nullptr };", AstStyle::Simple, ListSimplification::Full));
     }
 
+    void astarrayofptrs() {
+        ASSERT_EQUALS("a1[", testAst("int *a[1];", AstStyle::Simple, ListSimplification::Full));
+        ASSERT_EQUALS("a1[", testAst("int **a[1];", AstStyle::Simple, ListSimplification::Full));
+    }
+
 #define isStartOfExecutableScope(offset, code) isStartOfExecutableScope_(offset, code, __FILE__, __LINE__)
     template<size_t size>
     bool isStartOfExecutableScope_(int offset, const char (&code)[size], const char* file, int line) {