Fix #14967 internalAstError with function pointer in if

Author: web-flow

lib/tokenlist.cpp

@@ -461,7 +461,7 @@ static Token* skipDecl(Token* tok, std::vector<Token*>* inner = nullptr)
         return Token::Match(tok, "%name%| ,|)");
     };
 
-    if (!Token::Match(tok->previous(), "( %name%"))
+    if (tok->varId() || !Token::Match(tok->previous(), "( %name%"))
         return tok;
     Token *vartok = tok;
     while (Token::Match(vartok, "%name%|*|&|&&|::|<")) {

test/testtokenize.cpp

@@ -446,6 +446,7 @@ class TestTokenizer : public TestFixture {
         TEST_CASE(astfuncdecl);
         TEST_CASE(astarrayinit);
         TEST_CASE(astbracedinit);
+        TEST_CASE(astif);
 
         TEST_CASE(startOfExecutableScope);
 
@@ -7643,6 +7644,14 @@ class TestTokenizer : public TestFixture {
         ASSERT_EQUALS("anullptr{", testAst("int *a { nullptr };", AstStyle::Simple, ListSimplification::Full));
     }
 
+    void astif() {
+        ASSERT_EQUALS( // #14967
+            "ifxx(&&(",
+            testAst("void f(int (*x)()) {\n"
+                    "    if (x && x()) {}\n"
+                    "}\n", 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) {