Fix danmar#6690: Add isFunctionPointer to typeDef-info

swasti16 · Aug 16, 2024 · 434886f · 434886f
1 parent 9d9cf75
commit 434886f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
@@ -1040,6 +1040,10 @@ namespace {
             return mEndToken;
         }
 
+        Token* nameToken() const {
+            return mNameToken;
+        }
+
     private:
         static bool isCast(const Token* tok) {
             if (Token::Match(tok, "( %name% ) (|%name%|%num%"))
@@ -1145,6 +1149,7 @@ void Tokenizer::simplifyTypedef()
                 typedefInfo.lineNumber = typedefToken->linenr();
                 typedefInfo.column = typedefToken->column();
                 typedefInfo.used = t.second.isUsed();
+                typedefInfo.isFunctionPointer = Token::Match(t.second.nameToken(), "%name% ) (");
                 mTypedefInfo.push_back(std::move(typedefInfo));
 
                 t.second.removeDeclaration();
@@ -1645,6 +1650,7 @@ void Tokenizer::simplifyTypedefCpp()
         typedefInfo.lineNumber = typeName->linenr();
         typedefInfo.column = typeName->column();
         typedefInfo.used = false;
+        typedefInfo.isFunctionPointer = Token::Match(typeName, "%name% ) (");
         mTypedefInfo.push_back(std::move(typedefInfo));
 
         while (!done) {
@@ -6194,11 +6200,16 @@ std::string Tokenizer::dumpTypedefInfo() const
         outs += std::to_string(typedefInfo.used?1:0);
         outs += "\"";
 
-        outs += "/>";
+            outs += " isFunctionPointer=\"";
+            outs += std::to_string(typedefInfo.isFunctionPointer);
+            outs += "\"";
+
+            outs += "/>";
+            outs += '\n';
+        }
+        outs += "  </typedef-info>";
         outs += '\n';
     }
-    outs += "  </typedef-info>";
-    outs += '\n';
 
     return outs;
 }

diff --git a/lib/tokenize.h b/lib/tokenize.h
@@ -667,6 +667,7 @@ class CPPCHECKLIB Tokenizer {
         int lineNumber;
         int column;
         bool used;
+        bool isFunctionPointer;
     };
     std::vector<TypedefInfo> mTypedefInfo;