Skip to content

Fix #14224: Add lineno. in typedef tokens in dumpfile #7935

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 30, 2025
+30 −27
Merged

Fix #14224: Add lineno. in typedef tokens in dumpfile #7935

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions lib/tokenize.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 += "\" ";
Expand Down
54 changes: 27 additions & 27 deletions test/testsimplifytypedef.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down