diff options
| author | Maxime Coste <mawww@kakoune.org> | 2017-10-07 19:58:10 +0800 |
|---|---|---|
| committer | Maxime Coste <mawww@kakoune.org> | 2017-11-01 14:05:14 +0800 |
| commit | f3736a4b48b5fec1cba6d30191d9d7fbacb647ff (patch) | |
| tree | 813053e6c617263813e01faa834b103bcae6dde1 /src | |
| parent | 6bc582374558f83084b16558cf86dd3b62bfcb98 (diff) | |
Regex: tag instructions as scheduled as well instead of searching
And a few more code cleanup in the ThreadedRegexVM
Diffstat (limited to 'src')
| -rw-r--r-- | src/regex_impl.cc | 2 | ||||
| -rw-r--r-- | src/regex_impl.hh | 24 |
2 files changed, 17 insertions, 9 deletions
diff --git a/src/regex_impl.cc b/src/regex_impl.cc index f853665a..dcc968f6 100644 --- a/src/regex_impl.cc +++ b/src/regex_impl.cc @@ -666,7 +666,7 @@ private: uint32_t push_inst(CompiledRegex::Op op, uint32_t param = 0) { uint32_t res = m_program.instructions.size(); - m_program.instructions.push_back({ op, false, param }); + m_program.instructions.push_back({ op, false, false, param }); return res; } diff --git a/src/regex_impl.hh b/src/regex_impl.hh index 7f987756..d7457043 100644 --- a/src/regex_impl.hh +++ b/src/regex_impl.hh @@ -49,6 +49,7 @@ struct CompiledRegex : RefCountable { Op op; mutable bool processed; + mutable bool scheduled; uint32_t param; }; static_assert(sizeof(Instruction) == 8, ""); @@ -225,15 +226,14 @@ private: return StepResult::Failed; inst.processed = true; - const Codepoint cp = pos == m_end ? 0 : *pos; switch (inst.op) { case CompiledRegex::Literal: - if (inst.param == cp) + if (pos != m_end and inst.param == *pos) return StepResult::Consumed; return StepResult::Failed; case CompiledRegex::LiteralIgnoreCase: - if (inst.param == to_lower(cp)) + if (pos != m_end and inst.param == to_lower(*pos)) return StepResult::Consumed; return StepResult::Failed; case CompiledRegex::AnyChar: @@ -269,7 +269,9 @@ private: break; } case CompiledRegex::Matcher: - return m_program.matchers[inst.param](cp) ? + if (pos == m_end) + return StepResult::Failed; + return m_program.matchers[inst.param](*pos) ? StepResult::Consumed : StepResult::Failed; case CompiledRegex::LineStart: if (not is_line_start(pos)) @@ -332,10 +334,13 @@ private: next_threads.clear(); bool found_match = false; - while (true) + while (true) // Iterate on all codepoints and once at the end { for (auto& inst : m_program.instructions) + { inst.processed = false; + inst.scheduled = false; + } while (not current_threads.empty()) { @@ -363,10 +368,13 @@ private: release_saves(thread.saves); break; case StepResult::Consumed: - if (contains_that(next_threads, [&](auto& t) { return t.inst == thread.inst; })) + if (m_program.instructions[thread.inst].scheduled) + { release_saves(thread.saves); - else - next_threads.push_back(thread); + continue; + } + m_program.instructions[thread.inst].scheduled = true; + next_threads.push_back(thread); break; } } |