avoid impossible macro lookups in preprocessToken()

firewave · firewave · commit a114b4f5eb02 · 2025-09-05T21:19:39.000+02:00
diff --git a/simplecpp.cpp b/simplecpp.cpp
@@ -3191,7 +3191,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
`@@ -3191,7 +3191,7 @@ simplecpp::FileDataCache simplecpp::load(const simplecpp::TokenList &rawtokens,`
`3191`	`3191`	`static bool preprocessToken(simplecpp::TokenList &output, const simplecpp::Token *tok1, simplecpp::MacroMap &macros, std::vector<std::string> &files, simplecpp::OutputList outputList)`
`3192`	`3192`	`{`
`3193`	`3193`	`const simplecpp::Token * const tok = *tok1;`
`3194`		`- const simplecpp::MacroMap::const_iterator it = macros.find(tok->str());`
	`3194`	`+ const simplecpp::MacroMap::const_iterator it = tok->name ? macros.find(tok->str()) : macros.end();`
`3195`	`3195`	`if (it != macros.end()) {`
`3196`	`3196`	`simplecpp::TokenList value(files);`
`3197`	`3197`	`try {`