moved static array into simplifyName() and simplified it (cppcheck-opensource#575)

firewave · web-flow · commit a8fcf9bb5eb2 · 2025-10-28T20:36:27.000+01:00
diff --git a/simplecpp.cpp b/simplecpp.cpp
@@ -2666,12 +2666,11 @@ static void simplifyHasInclude(simplecpp::TokenList &expr, const simplecpp::DUI
     }
 }
 
-static const char * const altopData[] = {"and","or","bitand","bitor","compl","not","not_eq","xor"};
-static const std::set<std::string> altop(&altopData[0], &altopData[8]);
 static void simplifyName(simplecpp::TokenList &expr)
 {
     for (simplecpp::Token *tok = expr.front(); tok; tok = tok->next) {
         if (tok->name) {
+            static const std::set<std::string> altop = {"and","or","bitand","bitor","compl","not","not_eq","xor"};
             if (altop.find(tok->str()) != altop.end()) {
                 bool alt;
                 if (tok->str() == "not" || tok->str() == "compl") {

Original file line number	Diff line number	Diff line change
`@@ -2666,12 +2666,11 @@ static void simplifyHasInclude(simplecpp::TokenList &expr, const simplecpp::DUI`
`2666`	`2666`	`}`
`2667`	`2667`	`}`
`2668`	`2668`
`2669`		`-static const char * const altopData[] = {"and","or","bitand","bitor","compl","not","not_eq","xor"};`
`2670`		`-static const std::set<std::string> altop(&altopData[0], &altopData[8]);`
`2671`	`2669`	`static void simplifyName(simplecpp::TokenList &expr)`
`2672`	`2670`	`{`
`2673`	`2671`	`for (simplecpp::Token *tok = expr.front(); tok; tok = tok->next) {`
`2674`	`2672`	`if (tok->name) {`
	`2673`	`+ static const std::set<std::string> altop = {"and","or","bitand","bitor","compl","not","not_eq","xor"};`
`2675`	`2674`	`if (altop.find(tok->str()) != altop.end()) {`
`2676`	`2675`	`bool alt;`
`2677`	`2676`	`if (tok->str() == "not" \|\| tok->str() == "compl") {`