Add tag line and column in typedef-info in dump file

Author: swasti16

lib/tokenize.cpp

@@ -1106,16 +1106,22 @@ void Tokenizer::simplifyTypedef()
                 typedefInfo.column = typedefToken->column();
                 typedefInfo.used = t.second.isUsed();
                 typedefInfo.isFunctionPointer = isFunctionPointer(t.second.nameToken());
-                if (typedefInfo.isFunctionPointer) {
-                    const Token* tok = typedefToken;
-                    while (tok != t.second.endToken()) {
+                const Token* tok = typedefToken;
+                while (tok != t.second.endToken()) {
+                    if (tok->str() == typedefInfo.name) {
+                        typedefInfo.tagLineNumber = tok->linenr();
+                        typedefInfo.tagColumn = tok->column();
+                        if (!typedefInfo.isFunctionPointer)
+							break;
+                    }
+                    if (typedefInfo.isFunctionPointer) {
                         TypedefToken ttok;
                         ttok.name = tok->str();
                         ttok.lineNumber = tok->linenr();
                         ttok.column = tok->column();
                         typedefInfo.typedefInfoTokens.emplace_back(ttok);
-                        tok = tok->next();
                     }
+                    tok = tok->next();
                 }
                 mTypedefInfo.push_back(std::move(typedefInfo));
 
@@ -1638,20 +1644,26 @@ void Tokenizer::simplifyTypedefCpp()
         TypedefInfo typedefInfo;
         typedefInfo.name = typeName->str();
         typedefInfo.filename = list.file(typeName);
-        typedefInfo.lineNumber = typeName->linenr();
-        typedefInfo.column = typeName->column();
+        typedefInfo.lineNumber = typeDef->linenr();
+        typedefInfo.column = typeDef->column();
         typedefInfo.used = false;
         typedefInfo.isFunctionPointer = isFunctionPointer(typeName);
-        if (typedefInfo.isFunctionPointer) {
-            const Token* t = typeDef;
-            while (t != tok) {
+        const Token* t = typeDef;
+        while (t != tok) {
+            if (t->str() == typedefInfo.name) {
+                typedefInfo.tagLineNumber = t->linenr();
+                typedefInfo.tagColumn = t->column();
+                if (!typedefInfo.isFunctionPointer)
+                    break;
+            }
+            if (typedefInfo.isFunctionPointer) {
                 TypedefToken ttok;
                 ttok.name = t->str();
                 ttok.lineNumber = t->linenr();
                 ttok.column = t->column();
                 typedefInfo.typedefInfoTokens.emplace_back(ttok);
-                t = t->next();
             }
+            t = t->next();
         }
         mTypedefInfo.push_back(std::move(typedefInfo));
 
@@ -6327,6 +6339,14 @@ std::string Tokenizer::dumpTypedefInfo() const
         outs += std::to_string(typedefInfo.column);
         outs += "\"";
 
+        outs += " tagline=\"";
+        outs += std::to_string(typedefInfo.tagLineNumber);
+        outs += "\"";
+
+        outs += " tagcolumn=\"";
+        outs += std::to_string(typedefInfo.tagColumn);
+        outs += "\"";
+
         outs += " used=\"";
         outs += std::to_string(typedefInfo.used?1:0);
         outs += "\"";

lib/tokenize.h

@@ -696,6 +696,8 @@ class CPPCHECKLIB Tokenizer {
         std::string filename;
         int lineNumber;
         int column;
+        int tagLineNumber;
+        int tagColumn;
         bool used;
         bool isFunctionPointer;
         std::vector<TypedefToken> typedefInfoTokens;

test/testsimplifytypedef.cpp

@@ -4584,7 +4584,7 @@ class TestSimplifyTypedef : public TestFixture {
     void typedefInfo1() {
         const std::string xml = dumpTypedefInfo("typedef int A;\nA x;");
         ASSERT_EQUALS("  <typedef-info>\n"
-                      "    <info name=\"A\" file=\"file.c\" line=\"1\" column=\"1\" used=\"1\" isFunctionPointer=\"0\"/>\n"
+                      "    <info name=\"A\" file=\"file.c\" line=\"1\" column=\"1\" tagline=\"1\" tagcolumn=\"13\" used=\"1\" isFunctionPointer=\"0\"/>\n"
                       "  </typedef-info>\n",
                       xml);
     }
@@ -4596,7 +4596,7 @@ class TestSimplifyTypedef : public TestFixture {
                                                 "   typedef fp16 ( *pfp16 ) ( void );\n"
                                                 "}\n");
         ASSERT_EQUALS("  <typedef-info>\n"
-                      "    <info name=\"fp16\" file=\"file.c\" line=\"2\" column=\"1\" used=\"1\" isFunctionPointer=\"1\">\n"
+                      "    <info name=\"fp16\" file=\"file.c\" line=\"2\" column=\"1\" tagline=\"2\" tagcolumn=\"17\" used=\"1\" isFunctionPointer=\"1\">\n"
                       "      <token line=\"2\" column=\"1\" str=\"typedef\"/>\n"
                       "      <token line=\"2\" column=\"9\" str=\"void\"/>\n"
                       "      <token line=\"2\" column=\"14\" str=\"(\"/>\n"
@@ -4608,8 +4608,8 @@ class TestSimplifyTypedef : public TestFixture {
                       "      <token line=\"2\" column=\"33\" str=\"n\"/>\n"
                       "      <token line=\"2\" column=\"35\" str=\")\"/>\n"
                       "    </info>\n"
-                      "    <info name=\"int16_t\" file=\"file.c\" line=\"1\" column=\"1\" used=\"1\" isFunctionPointer=\"0\"/>\n"
-                      "    <info name=\"pfp16\" file=\"file.c\" line=\"4\" column=\"20\" used=\"0\" isFunctionPointer=\"1\">\n"
+                      "    <info name=\"int16_t\" file=\"file.c\" line=\"1\" column=\"1\" tagline=\"1\" tagcolumn=\"22\" used=\"1\" isFunctionPointer=\"0\"/>\n"
+                      "    <info name=\"pfp16\" file=\"file.c\" line=\"4\" column=\"4\" tagline=\"4\" tagcolumn=\"20\" used=\"0\" isFunctionPointer=\"1\">\n"
                       "      <token line=\"4\" column=\"4\" str=\"typedef\"/>\n"
                       "      <token line=\"4\" column=\"12\" str=\"void\"/>\n"
                       "      <token line=\"4\" column=\"12\" str=\"(\"/>\n"