avoid impossible macro lookups in preprocessToken() [skip ci]

firewave · firewave · commit 69be83e0a285 · 2025-09-06T00:25:07.000+02:00
diff --git a/simplecpp.cpp b/simplecpp.cpp
@@ -3196,7 +3196,7 @@ simplecpp::FileDataCache simplecpp::load(const simplecpp::TokenList &rawtokens,
 static bool preprocessToken(simplecpp::TokenList &output, const simplecpp::Token **tok1, simplecpp::MacroMap &macros, std::vector<std::string> &files, simplecpp::OutputList *outputList)
 {
     const simplecpp::Token * const tok = *tok1;
-    const simplecpp::MacroMap::const_iterator it = macros.find(tok->str());
+    const simplecpp::MacroMap::const_iterator it = tok->name ? macros.find(tok->str()) : macros.end();
     if (it != macros.end()) {
         simplecpp::TokenList value(files);
         try {

Original file line number	Diff line number	Diff line change
`@@ -3196,7 +3196,7 @@ simplecpp::FileDataCache simplecpp::load(const simplecpp::TokenList &rawtokens,`
`3196`	`3196`	`static bool preprocessToken(simplecpp::TokenList &output, const simplecpp::Token *tok1, simplecpp::MacroMap &macros, std::vector<std::string> &files, simplecpp::OutputList outputList)`
`3197`	`3197`	`{`
`3198`	`3198`	`const simplecpp::Token * const tok = *tok1;`
`3199`		`- const simplecpp::MacroMap::const_iterator it = macros.find(tok->str());`
	`3199`	`+ const simplecpp::MacroMap::const_iterator it = tok->name ? macros.find(tok->str()) : macros.end();`
`3200`	`3200`	`if (it != macros.end()) {`
`3201`	`3201`	`simplecpp::TokenList value(files);`
`3202`	`3202`	`try {`