Optimize Regex CharacterClass matching

Take advantage of ranges sorting to early out, make the logic
inline.

1 files changed, 1 insertions, 15 deletions

diff --git a/src/regex_impl.cc b/src/regex_impl.cc
index 23321af8..9ada6fd5 100644
--- a/src/regex_impl.cc
+++ b/src/regex_impl.cc
@@ -959,7 +959,7 @@ private:
                 {
                     for (Codepoint cp = 0; cp < CompiledRegex::StartDesc::count; ++cp)
                     {
-                        if (start_desc.map[cp] or is_character_class(character_class, cp))
+                        if (start_desc.map[cp] or character_class.matches(cp))
                             start_desc.map[cp] = true;
                     }
                 }
@@ -1165,20 +1165,6 @@ CompiledRegex compile_regex(StringView re, RegexCompileFlags flags)
     return RegexCompiler{RegexParser::parse(re), flags}.get_compiled_regex();
 }
 
-bool is_character_class(const CharacterClass& character_class, Codepoint cp)
-{
-    if (character_class.ignore_case)
-        cp = to_lower(cp);
-
-    auto it = std::find_if(character_class.ranges.begin(),
-                           character_class.ranges.end(),
-                           [cp](auto& range) { return range.min <= cp and cp <= range.max; });
-
-    bool found = it != character_class.ranges.end() or (character_class.ctypes != CharacterType::None and
-                                                        is_ctype(character_class.ctypes, cp));
-    return found != character_class.negative;
-}
-
 bool is_ctype(CharacterType ctype, Codepoint cp)
 {
     auto check = [&](CharacterType bit, CharacterType not_bit, auto&& func) {