Optimise unicode::utf8_char_len & utf16_char_len

calamity-inc · Jul 1, 2024 · 83ca134 · 83ca134
1 parent e945c97
commit 83ca134
Showing 1 changed file with 4 additions and 10 deletions.
diff --git a/soup/unicode.cpp b/soup/unicode.cpp
@@ -188,25 +188,19 @@ NAMESPACE_SOUP
 	size_t unicode::utf8_char_len(const std::string& str) noexcept
 	{
 		size_t char_len = 0;
-		for (const auto& c : str)
+		for (size_t i = 0; i != str.size(); ++i)
 		{
-			if (!UTF8_IS_CONTINUATION(c))
-			{
-				++char_len;
-			}
+			char_len += !UTF8_IS_CONTINUATION(str[i]);
 		}
 		return char_len;
 	}
 
 	size_t unicode::utf16_char_len(const UTF16_STRING_TYPE& str) noexcept
 	{
 		size_t char_len = 0;
-		for (const auto& c : str)
+		for (size_t i = 0; i != str.size(); ++i)
 		{
-			SOUP_IF_LIKELY (!UTF16_IS_LOW_SURROGATE(c))
-			{
-				++char_len;
-			}
+			char_len += !UTF16_IS_LOW_SURROGATE(str[i]);
 		}
 		return char_len;
 	}