Fix #14413 : Add tag line and column in typedef-info in dump file (danmar#8134)

Author: swasti16

lib/tokenize.cpp

@@ -1104,6 +1104,10 @@ void Tokenizer::simplifyTypedef()
                 typedefInfo.filename = list.file(typedefToken);
                 typedefInfo.lineNumber = typedefToken->linenr();
                 typedefInfo.column = typedefToken->column();
+                if (Token::Match(typedefToken->next(), "struct|enum|class|union %name% {") && typedefToken->strAt(2) == typedefInfo.name) {
+                    typedefInfo.tagLine = typedefToken->tokAt(2)->linenr();
+                    typedefInfo.tagColumn = typedefToken->tokAt(2)->column();
+                }
                 typedefInfo.used = t.second.isUsed();
                 typedefInfo.isFunctionPointer = isFunctionPointer(t.second.nameToken());
                 if (typedefInfo.isFunctionPointer) {
@@ -1638,8 +1642,12 @@ 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();
+        if (Token::Match(typeDef->next(), "struct|enum|class|union %name% {") && typeDef->strAt(2) == typedefInfo.name) {
+            typedefInfo.tagLine = typeDef->tokAt(2)->linenr();
+            typedefInfo.tagColumn = typeDef->tokAt(2)->column();
+        }
         typedefInfo.used = false;
         typedefInfo.isFunctionPointer = isFunctionPointer(typeName);
         if (typedefInfo.isFunctionPointer) {
@@ -6361,7 +6369,15 @@ std::string Tokenizer::dumpTypedefInfo() const
         outs += " column=\"";
         outs += std::to_string(typedefInfo.column);
         outs += "\"";
+        if (typedefInfo.tagLine > -1 && typedefInfo.tagColumn > -1) {
+            outs += " tagline=\"";
+            outs += std::to_string(typedefInfo.tagLine);
+            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 tagLine{-1};
+        int tagColumn{-1};
         bool used;
         bool isFunctionPointer;
         std::vector<TypedefToken> typedefInfoTokens;

test/testsimplifytypedef.cpp

@@ -259,6 +259,7 @@ class TestSimplifyTypedef : public TestFixture {
         TEST_CASE(typedefInfo1);
         TEST_CASE(typedefInfo2);
         TEST_CASE(typedefInfo3);
+        TEST_CASE(typedefInfo4);
     }
 
     class TokenizerTest final : public Tokenizer
@@ -4609,7 +4610,7 @@ class TestSimplifyTypedef : public TestFixture {
                       "      <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=\"pfp16\" file=\"file.c\" line=\"4\" column=\"4\" 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"
@@ -4638,6 +4639,17 @@ class TestSimplifyTypedef : public TestFixture {
                                                 "}\n");
         ASSERT_EQUALS("",xml);
     }
+
+    void typedefInfo4() {
+        const std::string xml = dumpTypedefInfo("typedef struct coord {\n"
+                                                "    uint16_t x;\n"
+                                                "    uint16_t y;\n"
+                                                "} coord;\n"
+                                                "coord c;");
+        ASSERT_EQUALS("  <typedef-info>\n"
+                      "    <info name=\"coord\" file=\"file.c\" line=\"1\" column=\"1\" tagline=\"1\" tagcolumn=\"16\" used=\"1\" isFunctionPointer=\"0\"/>\n"
+                      "  </typedef-info>\n", xml);
+    }
 };
 
 REGISTER_TEST(TestSimplifyTypedef)