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

Regex: small code style tweak

Browse Source
This commit is contained in:
Maxime Coste 2018-04-29 17:26:49 +10:00
parent 1e8026f143
commit 787ca7f19b
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/regex_impl.hh
View File

@ -202,9 +202,8 @@ public:
}; };
EffectiveIt start{config.begin}; EffectiveIt start{config.begin};
const auto& start_desc = direction == MatchDirection::Forward ? m_program.forward_start_desc if (const auto& start_desc = direction == MatchDirection::Forward ?
: m_program.backward_start_desc; m_program.forward_start_desc : m_program.backward_start_desc)
if (start_desc)
{ {
if (search) if (search)
{ {
@ -213,8 +212,7 @@ public:
return false; return false;
} }
else if (start != config.end and else if (start != config.end and
not start_desc->map[*start < CompiledRegex::StartDesc::count ? not start_desc->map[*start < StartDesc::count ? *start : StartDesc::other])
*start : CompiledRegex::StartDesc::other])
return false; return false;
} }
@ -281,6 +279,7 @@ private:
int16_t saves; int16_t saves;
}; };
using StartDesc = CompiledRegex::StartDesc;
using Utf8It = utf8::iterator<Iterator>; using Utf8It = utf8::iterator<Iterator>;
using EffectiveIt = std::conditional_t<direction == MatchDirection::Forward, using EffectiveIt = std::conditional_t<direction == MatchDirection::Forward,
Utf8It, std::reverse_iterator<Utf8It>>; Utf8It, std::reverse_iterator<Utf8It>>;
@ -507,12 +506,11 @@ private:
} }
} }
void to_next_start(EffectiveIt& start, const EffectiveIt& end, void to_next_start(EffectiveIt& start, const EffectiveIt& end, const StartDesc& start_desc)
const CompiledRegex::StartDesc& start_desc)
{ {
Codepoint cp; Codepoint cp;
while (start != end and (cp = *start) >= 0 and while (start != end and (cp = *start) >= 0 and
not start_desc.map[cp < CompiledRegex::StartDesc::count ? cp : CompiledRegex::StartDesc::other]) not start_desc.map[cp < StartDesc::count ? cp : StartDesc::other])
++start; ++start;
} }