xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Regex: smarter handling of start chars computation for character class

Browse Source
This commit is contained in:
Maxime Coste 2017-11-30 14:19:41 +08:00
parent 839da764e7
commit c1f0efa3f4
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/regex_impl.cc
View File

@ -891,10 +891,23 @@ private:
case ParsedRegex::Class: case ParsedRegex::Class:
{ {
auto& character_class = m_parsed_regex.character_classes[node.value]; auto& character_class = m_parsed_regex.character_classes[node.value];
for (Codepoint cp = 0; cp < CompiledRegex::StartChars::count; ++cp) if (character_class.ctypes == CharacterType::None and not character_class.negative)
{ {
if (is_character_class(character_class, cp)) for (auto& range : character_class.ranges)
start_chars.map[cp] = true; {
auto min = std::min(CompiledRegex::StartChars::other, range.min);
auto max = std::min(CompiledRegex::StartChars::other, range.max);
for (Codepoint cp = min; cp <= max; ++cp)
start_chars.map[cp] = true;
}
}
else
{
for (Codepoint cp = 0; cp < CompiledRegex::StartChars::other; ++cp)
{
if (start_chars.map[cp] or is_character_class(character_class, cp))
start_chars.map[cp] = true;
}
} }
start_chars.map[CompiledRegex::StartChars::other] = true; start_chars.map[CompiledRegex::StartChars::other] = true;
return node.quantifier.allows_none(); return node.quantifier.allows_none();