fixed performance regression in endsWith()

firewave · firewave · commit 050fceac1bf0 · 2024-05-06T16:37:57.000+02:00
diff --git a/simplecpp.cpp b/simplecpp.cpp
@@ -141,7 +141,10 @@ static unsigned long long stringToULL(const std::string &s)
 
 static bool endsWith(const std::string &s, const std::string &e)
 {
-    return (s.size() >= e.size()) && std::equal(e.rbegin(), e.rend(), s.rbegin());
+    // TODO: std::equal() is much faster than std::string::compare() in a benchmark
+    // but in our case it leads to a big performance regression
+    //return (s.size() >= e.size()) && std::equal(e.rbegin(), e.rend(), s.rbegin());
+    return (s.size() >= e.size() && s.compare(s.size() - e.size(), e.size(), e) == 0);
 }
 
 static bool sameline(const simplecpp::Token *tok1, const simplecpp::Token *tok2)

Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,10 @@ static unsigned long long stringToULL(const std::string &s)`
`141`	`141`
`142`	`142`	`static bool endsWith(const std::string &s, const std::string &e)`
`143`	`143`	`{`
`144`		`- return (s.size() >= e.size()) && std::equal(e.rbegin(), e.rend(), s.rbegin());`
	`144`	`+ // TODO: std::equal() is much faster than std::string::compare() in a benchmark`
	`145`	`+ // but in our case it leads to a big performance regression`
	`146`	`+ //return (s.size() >= e.size()) && std::equal(e.rbegin(), e.rend(), s.rbegin());`
	`147`	`+ return (s.size() >= e.size() && s.compare(s.size() - e.size(), e.size(), e) == 0);`
`145`	`148`	`}`
`146`	`149`
`147`	`150`	`static bool sameline(const simplecpp::Token tok1, const simplecpp::Token tok2)`