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

Regex: small code cleanup in the Save compilation code

Browse Source
This commit is contained in:
Maxime Coste 2017-10-21 10:30:35 +08:00
parent 9e15207d2a
commit 6e0275e550
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/regex_impl.cc
View File

@ -634,9 +634,10 @@ private:
const auto start_pos = m_program.instructions.size(); const auto start_pos = m_program.instructions.size();
const bool ignore_case = node->ignore_case; const bool ignore_case = node->ignore_case;
const Codepoint capture = (node->op == ParsedRegex::Alternation or node->op == ParsedRegex::Sequence) ? node->value : -1; const bool save = (node->op == ParsedRegex::Alternation or node->op == ParsedRegex::Sequence) and
if (capture != -1 and (capture == 0 or not (m_flags & RegexCompileFlags::NoSubs))) (node->value == 0 or (node->value != -1 and not (m_flags & RegexCompileFlags::NoSubs)));
push_inst(CompiledRegex::Save, capture * 2 + (m_forward ? 0 : 1)); if (save)
push_inst(CompiledRegex::Save, node->value * 2 + (m_forward ? 0 : 1));
Vector<uint32_t> goto_inner_end_offsets; Vector<uint32_t> goto_inner_end_offsets;
switch (node->op) switch (node->op)
@ -743,8 +744,8 @@ private:
for (auto& offset : goto_inner_end_offsets) for (auto& offset : goto_inner_end_offsets)
m_program.instructions[offset].param = m_program.instructions.size(); m_program.instructions[offset].param = m_program.instructions.size();
if (capture != -1 and (capture == 0 or not (m_flags & RegexCompileFlags::NoSubs))) if (save)
push_inst(CompiledRegex::Save, capture * 2 + (m_forward ? 1 : 0)); push_inst(CompiledRegex::Save, node->value * 2 + (m_forward ? 1 : 0));
return start_pos; return start_pos;
} }