Skip to content

Fix #14988: Add relative path to preprocessor dump #8812

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
olabetskyi merged 2 commits into from
Aug 27, 2026
+29 −3
Merged

Fix #14988: Add relative path to preprocessor dump #8812

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1dc9543
Fix #14988: Add relative path to preprocessor dump
olabetskyi Aug 26, 2026
ce78fd9
Test
olabetskyi Aug 27, 2026
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
6 changes: 3 additions & 3 deletions lib/preprocessor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1067,10 +1067,10 @@ void Preprocessor::dump(std::ostream &out) const
for (const simplecpp::MacroUsage &macroUsage: mMacroUsage) {
out << " <macro"
<< " name=\"" << macroUsage.macroName << "\""
<< " file=\"" << ErrorLogger::toxml(mTokens.file(macroUsage.macroLocation)) << "\""
<< " file=\"" << ErrorLogger::toxml(mSettings.relativePaths ? Path::getRelativePath(mTokens.file(macroUsage.macroLocation), mSettings.basePaths) : mTokens.file(macroUsage.macroLocation)) << "\""
<< " line=\"" << macroUsage.macroLocation.line << "\""
<< " column=\"" << macroUsage.macroLocation.col << "\""
<< " usefile=\"" << ErrorLogger::toxml(mTokens.file(macroUsage.useLocation)) << "\""
<< " usefile=\"" << ErrorLogger::toxml(mSettings.relativePaths ? Path::getRelativePath(mTokens.file(macroUsage.useLocation), mSettings.basePaths) : mTokens.file(macroUsage.useLocation)) << "\""
<< " useline=\"" << macroUsage.useLocation.line << "\""
<< " usecolumn=\"" << macroUsage.useLocation.col << "\""
<< " is-known-value=\"" << bool_to_string(macroUsage.macroValueKnown) << "\""
Expand All @@ -1083,7 +1083,7 @@ void Preprocessor::dump(std::ostream &out) const
out << " <simplecpp-if-cond>" << std::endl;
for (const simplecpp::IfCond &ifCond: mIfCond) {
out << " <if-cond"
<< " file=\"" << ErrorLogger::toxml(mTokens.file(ifCond.location)) << "\""
<< " file=\"" << ErrorLogger::toxml(mSettings.relativePaths ? Path::getRelativePath(mTokens.file(ifCond.location), mSettings.basePaths) : mTokens.file(ifCond.location)) << "\""
<< " line=\"" << ifCond.location.line << "\""
<< " column=\"" << ifCond.location.col << "\""
<< " E=\"" << ErrorLogger::toxml(ifCond.E) << "\""
Expand Down
26 changes: 26 additions & 0 deletions test/testpreprocessor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,6 +386,8 @@ class TestPreprocessor : public TestFixture {
TEST_CASE(writeLocations);

TEST_CASE(pragmaAsm);

TEST_CASE(dumpPreprocessor);
}

template<size_t size>
Expand Down Expand Up @@ -3204,6 +3206,30 @@ class TestPreprocessor : public TestFixture {
const char code[] = "#pragma asm\n";
ASSERT_THROW_INTERNAL(getcodeforcfg(settingsDefault, *this, code, "", "test.cpp"), InternalError::SYNTAX);
}

void dumpPreprocessor() {
const char code[] = "#if M == 0\n"
"#endif\n;\n";
std::vector<std::string> files;
simplecpp::OutputList outputList;

Settings settings;
settings.relativePaths = true;
settings.basePaths.emplace_back("/some/path");

simplecpp::TokenList tokens1(code, files, "/some/path/test.cpp", {}, &outputList);
Preprocessor preprocessor(tokens1, settings, *this, Standards::Language::CPP);
(void)preprocessor.preprocess("", files, outputList);
(void)preprocessor.reportOutput(outputList, true);

std::ostringstream ostr;
preprocessor.dump(ostr);
ASSERT_EQUALS(
" <simplecpp-if-cond>\n"
" <if-cond file=\"test.cpp\" line=\"1\" column=\"2\" E=\"M == 0\" result=\"1\"/>\n"
" </simplecpp-if-cond>\n",
ostr.str());
}
};

REGISTER_TEST(TestPreprocessor)
Loading