From ee586e055eb1f883162a7881fda0b0a07c631402 Mon Sep 17 00:00:00 2001
From: swasti16 <swasti1shrivastava@gmail.com>
Date: Thu, 30 Oct 2025 20:40:53 +0530
Subject: [PATCH] Add lineno. in typedef tokens

---
 lib/tokenize.cpp             |  3 ++
 test/testsimplifytypedef.cpp | 54 ++++++++++++++++++------------------
 2 files changed, 30 insertions(+), 27 deletions(-)

diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
index 1f2ec5c5b2c..32c3d408cdc 100644
--- a/lib/tokenize.cpp
+++ b/lib/tokenize.cpp
@@ -6318,6 +6318,9 @@ std::string Tokenizer::dumpTypedefInfo() const
         outs += '\n';
         for (const auto& t : typedefInfo.typedefInfoTokens) {
             outs += "      <token ";
+            outs += "line=\"";
+            outs += std::to_string(t.lineNumber);
+            outs += "\" ";
             outs += "column=\"";
             outs += std::to_string(t.column);
             outs += "\" ";
diff --git a/test/testsimplifytypedef.cpp b/test/testsimplifytypedef.cpp
index b13a0113b9e..3ffa4290341 100644
--- a/test/testsimplifytypedef.cpp
+++ b/test/testsimplifytypedef.cpp
@@ -4557,36 +4557,36 @@ class TestSimplifyTypedef : public TestFixture {
                                                 "}\n");
         ASSERT_EQUALS("  <typedef-info>\n"
                       "    <info name=\"fp16\" file=\"file.c\" line=\"2\" column=\"1\" used=\"1\" isFunctionPointer=\"1\">\n"
-                      "      <token column=\"1\" str=\"typedef\"/>\n"
-                      "      <token column=\"9\" str=\"void\"/>\n"
-                      "      <token column=\"14\" str=\"(\"/>\n"
-                      "      <token column=\"16\" str=\"*\"/>\n"
-                      "      <token column=\"17\" str=\"fp16\"/>\n"
-                      "      <token column=\"22\" str=\")\"/>\n"
-                      "      <token column=\"23\" str=\"(\"/>\n"
-                      "      <token column=\"25\" str=\"int16_t\"/>\n"
-                      "      <token column=\"33\" str=\"n\"/>\n"
-                      "      <token column=\"35\" str=\")\"/>\n"
+                      "      <token line=\"2\" column=\"1\" str=\"typedef\"/>\n"
+                      "      <token line=\"2\" column=\"9\" str=\"void\"/>\n"
+                      "      <token line=\"2\" column=\"14\" str=\"(\"/>\n"
+                      "      <token line=\"2\" column=\"16\" str=\"*\"/>\n"
+                      "      <token line=\"2\" column=\"17\" str=\"fp16\"/>\n"
+                      "      <token line=\"2\" column=\"22\" str=\")\"/>\n"
+                      "      <token line=\"2\" column=\"23\" str=\"(\"/>\n"
+                      "      <token line=\"2\" column=\"25\" str=\"int16_t\"/>\n"
+                      "      <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"
-                      "      <token column=\"4\" str=\"typedef\"/>\n"
-                      "      <token column=\"12\" str=\"void\"/>\n"
-                      "      <token column=\"12\" str=\"(\"/>\n"
-                      "      <token column=\"12\" str=\"*\"/>\n"
-                      "      <token column=\"17\" str=\"(\"/>\n"
-                      "      <token column=\"19\" str=\"*\"/>\n"
-                      "      <token column=\"20\" str=\"pfp16\"/>\n"
-                      "      <token column=\"26\" str=\")\"/>\n"
-                      "      <token column=\"28\" str=\"(\"/>\n"
-                      "      <token column=\"30\" str=\"void\"/>\n"
-                      "      <token column=\"35\" str=\")\"/>\n"
-                      "      <token column=\"35\" str=\")\"/>\n"
-                      "      <token column=\"35\" str=\"(\"/>\n"
-                      "      <token column=\"35\" str=\"signed\"/>\n"
-                      "      <token column=\"35\" str=\"short\"/>\n"
-                      "      <token column=\"35\" str=\"n\"/>\n"
-                      "      <token column=\"35\" str=\")\"/>\n"
+                      "      <token line=\"4\" column=\"4\" str=\"typedef\"/>\n"
+                      "      <token line=\"4\" column=\"12\" str=\"void\"/>\n"
+                      "      <token line=\"4\" column=\"12\" str=\"(\"/>\n"
+                      "      <token line=\"4\" column=\"12\" str=\"*\"/>\n"
+                      "      <token line=\"4\" column=\"17\" str=\"(\"/>\n"
+                      "      <token line=\"4\" column=\"19\" str=\"*\"/>\n"
+                      "      <token line=\"4\" column=\"20\" str=\"pfp16\"/>\n"
+                      "      <token line=\"4\" column=\"26\" str=\")\"/>\n"
+                      "      <token line=\"4\" column=\"28\" str=\"(\"/>\n"
+                      "      <token line=\"4\" column=\"30\" str=\"void\"/>\n"
+                      "      <token line=\"4\" column=\"35\" str=\")\"/>\n"
+                      "      <token line=\"4\" column=\"35\" str=\")\"/>\n"
+                      "      <token line=\"4\" column=\"35\" str=\"(\"/>\n"
+                      "      <token line=\"4\" column=\"35\" str=\"signed\"/>\n"
+                      "      <token line=\"4\" column=\"35\" str=\"short\"/>\n"
+                      "      <token line=\"4\" column=\"35\" str=\"n\"/>\n"
+                      "      <token line=\"4\" column=\"35\" str=\")\"/>\n"
                       "    </info>\n"
                       "  </typedef-info>\n",xml);
     }