handle arrays in simplifyFunctionPointers

ludviggunne · ludviggunne · commit 8e0a83e42cf2 · 2026-05-11T17:38:14.000+02:00
diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
@@ -1025,7 +1025,12 @@ namespace {
 }
 
 bool Tokenizer::isFunctionPointer(const Token* tok) {
-    return Token::Match(tok, "%name% ) (");
+    if (!Token::Match(tok, "%name%"))
+        return false;
+    tok = tok->next();
+    while (Token::Match(tok, "["))
+        tok = tok->link()->next();
+    return Token::simpleMatch(tok, ") (");
 }
 
 static bool matchCurrentType(const Token* tok, std::map<int, std::string>& types)

Original file line number	Diff line number	Diff line change
`@@ -1025,7 +1025,12 @@ namespace {`
`1025`	`1025`	`}`
`1026`	`1026`
`1027`	`1027`	`bool Tokenizer::isFunctionPointer(const Token* tok) {`
`1028`		`- return Token::Match(tok, "%name% ) (");`
	`1028`	`+ if (!Token::Match(tok, "%name%"))`
	`1029`	`+ return false;`
	`1030`	`+ tok = tok->next();`
	`1031`	`+ while (Token::Match(tok, "["))`
	`1032`	`+ tok = tok->link()->next();`
	`1033`	`+ return Token::simpleMatch(tok, ") (");`
`1029`	`1034`	`}`
`1030`	`1035`
`1031`	`1036`	`static bool matchCurrentType(const Token* tok, std::map<int, std::string>& types)`