Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
55 changes: 37 additions & 18 deletions simplecpp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4188,6 +4188,27 @@ static std::string getTimeDefine(const struct tm *timep)
return std::string("\"").append(buf).append("\"");
}

/** Report the usages of a macro. This is done when its definition goes away, so that #undef and redefinition do not lose them. */
static void addMacroUsage(const simplecpp::Macro &macro, std::map<std::string, std::list<simplecpp::Location>> &maybeUsedMacros, std::list<simplecpp::MacroUsage> *macroUsage)
{
if (!macroUsage)
return;
std::list<simplecpp::Macro::Usage> usage = macro.usage();
const std::map<std::string, std::list<simplecpp::Location>>::iterator maybeUsed = maybeUsedMacros.find(macro.name());
if (maybeUsed != maybeUsedMacros.end()) {
usage.insert(usage.end(), maybeUsed->second.begin(), maybeUsed->second.end());
maybeUsedMacros.erase(maybeUsed);
}
for (std::list<simplecpp::Macro::Usage>::iterator usageIt = usage.begin(); usageIt != usage.end(); ++usageIt) {
simplecpp::MacroUsage mu(macro.valueDefinedInCode());
mu.macroName = macro.name();
mu.macroLocation = macro.defineLocation();
mu.useLocation = usageIt->location;
mu.arg = std::move(usageIt->arg);
macroUsage->emplace_back(std::move(mu));
}
}

void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenList &rawtokens, std::vector<std::string> &files, simplecpp::FileDataCache &cache, const simplecpp::DUI &dui, simplecpp::OutputList *outputList, std::list<simplecpp::MacroUsage> *macroUsage, std::list<simplecpp::IfCond> *ifCond)
{
#ifdef SIMPLECPP_WINDOWS
Expand Down Expand Up @@ -4331,6 +4352,8 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
}

std::map<std::string, std::list<Location>> maybeUsedMacros;
// usages of macros that are undefined or redefined, handed over only when preprocessing succeeds
std::list<MacroUsage> pendingUsage;

for (const Token *rawtok = nullptr; rawtok || !includetokenstack.empty();) {
if (rawtok == nullptr) {
Expand Down Expand Up @@ -4395,10 +4418,12 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
const Macro &macro = Macro(rawtok->previous, files);
if (dui.undefined.find(macro.name()) == dui.undefined.end()) {
const MacroMap::iterator it = macros.find(macro.name());
if (it == macros.end())
if (it == macros.end()) {
macros.insert(std::pair<TokenString, Macro>(macro.name(), macro));
else
} else {
addMacroUsage(it->second, maybeUsedMacros, macroUsage ? &pendingUsage : nullptr);
it->second = macro;
}
}
} catch (const std::runtime_error &err) {
if (outputList) {
Expand Down Expand Up @@ -4687,8 +4712,13 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
const Token *tok = rawtok->next;
while (sameline(rawtok,tok) && tok->comment)
tok = tok->next;
if (sameline(rawtok, tok))
macros.erase(tok->str());
if (sameline(rawtok, tok)) {
const MacroMap::iterator it = macros.find(tok->str());
if (it != macros.end()) {
addMacroUsage(it->second, maybeUsedMacros, macroUsage ? &pendingUsage : nullptr);
macros.erase(it);
}
}
}
} else if (ifstates.top() == True && rawtok->str() == PRAGMA && rawtok->next && rawtok->next->str() == ONCE && sameline(rawtok,rawtok->next)) {
pragmaOnce.insert(rawtokens.file(rawtok->location));
Expand Down Expand Up @@ -4741,20 +4771,9 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
}

if (macroUsage) {
for (simplecpp::MacroMap::const_iterator macroIt = macros.begin(); macroIt != macros.end(); ++macroIt) {
const Macro &macro = macroIt->second;
std::list<Macro::Usage> usage = macro.usage();
const std::list<Location>& temp = maybeUsedMacros[macro.name()];
usage.insert(usage.end(), temp.begin(), temp.end());
for (std::list<Macro::Usage>::iterator usageIt = usage.begin(); usageIt != usage.end(); ++usageIt) {
MacroUsage mu(macro.valueDefinedInCode());
mu.macroName = macro.name();
mu.macroLocation = macro.defineLocation();
mu.useLocation = usageIt->location;
mu.arg = std::move(usageIt->arg);
macroUsage->emplace_back(std::move(mu));
}
}
macroUsage->splice(macroUsage->end(), pendingUsage);
for (simplecpp::MacroMap::const_iterator macroIt = macros.begin(); macroIt != macros.end(); ++macroIt)
addMacroUsage(macroIt->second, maybeUsedMacros, macroUsage);
}
}

Expand Down
61 changes: 61 additions & 0 deletions test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5770,6 +5770,63 @@ static void macroUsage()
}
}

static void macroUsageUndef()
{
const char code[] = "#define A 1\n"
"A\n"
"#undef A\n"
"A\n";
std::list<simplecpp::MacroUsage> macroUsage;
ASSERT_EQUALS("1@A(2:1) A(4:1)", expandedTokens(code, simplecpp::DUI(), &macroUsage));
ASSERT_EQUALS("A 1:9 use 2:1\n", toString(macroUsage));

// the argument of an integer constant macro is kept
ASSERT_EQUALS("UINT32_C use 2:1: [5]\n", macroUsageArg("#define UINT32_C(x) x\nUINT32_C(5)\n#undef UINT32_C\n"));
}

static void macroUsageUndefError()
{
// no usages are reported when preprocessing fails
const char code[] = "#define A 1\n"
"A\n"
"#undef A\n"
"#error stop\n";
std::list<simplecpp::MacroUsage> macroUsage;
simplecpp::OutputList outputList;
preprocess(code, simplecpp::DUI(), &outputList, &macroUsage);
ASSERT_EQUALS("", toString(macroUsage));
}

static void macroUsageRedefine()
{
const char code[] = "#define A 1\n"
"A\n"
"#undef A\n"
"#define A 2\n"
"A\n"
"#define B 3\n"
"B\n"
"#define B 4\n"
"B\n";
std::list<simplecpp::MacroUsage> macroUsage;
ASSERT_EQUALS("1@A(2:1) 2@A(5:1) 3@B(7:1) 4@B(9:1)", expandedTokens(code, simplecpp::DUI(), &macroUsage));
ASSERT_EQUALS("A 1:9 use 2:1\nA 4:9 use 5:1\nB 6:9 use 7:1\nB 8:9 use 9:1\n", toString(macroUsage));
}

static void macroUsageUndefIfdef()
{
const char code[] = "#define A\n"
"#ifdef A\n"
"#endif\n"
"#undef A\n"
"#define A\n"
"#ifdef A\n"
"#endif\n";
std::list<simplecpp::MacroUsage> macroUsage;
ASSERT_EQUALS("", expandedTokens(code, simplecpp::DUI(), &macroUsage));
ASSERT_EQUALS("A 1:9 use 2:8\nA 5:9 use 6:8\n", toString(macroUsage));
}

static void isAbsolutePath() {
#ifdef _WIN32
ASSERT_EQUALS(true, simplecpp::isAbsolutePath("C:\\foo\\bar"));
Expand Down Expand Up @@ -6194,6 +6251,10 @@ static void runTests(int argc, char **argv, Input input)

TEST_CASE(ifCond);
TEST_CASE(macroUsage);
TEST_CASE(macroUsageUndef);
TEST_CASE(macroUsageUndefError);
TEST_CASE(macroUsageRedefine);
TEST_CASE(macroUsageUndefIfdef);

TEST_CASE(fuzz_crash);

Expand Down