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

Regex: small code tweak

Browse Source
This commit is contained in:
Maxime Coste 2017-10-04 11:28:58 +08:00
parent e0fac20f6c
commit cf5055f68b
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/regex_impl.hh
View File

@ -270,7 +270,7 @@ struct ThreadedRegexVM
const bool search = (flags & RegexExecFlags::Search); const bool search = (flags & RegexExecFlags::Search);
const auto start_offset = search ? 0 : CompiledRegex::search_prefix_size; const auto start_offset = search ? 0 : CompiledRegex::search_prefix_size;
Vector<Thread> current_threads{Thread{m_program.bytecode.data() + start_offset, initial_saves}}; Vector<Thread> current_threads{Thread{m_program.bytecode.data() + start_offset, initial_saves}};
Vector<Thread> next_threads; Vector<Thread> next_threads;
for (m_pos = Utf8It{m_begin, m_begin, m_end}; m_pos != m_end; ++m_pos) for (m_pos = Utf8It{m_begin, m_begin, m_end}; m_pos != m_end; ++m_pos)
@ -282,16 +282,14 @@ struct ThreadedRegexVM
switch (step(thread, current_threads)) switch (step(thread, current_threads))
{ {
case StepResult::Matched: case StepResult::Matched:
if (not (flags & RegexExecFlags::Search) or // We are not at end, this is not a full match if (not search or // We are not at end, this is not a full match
(flags & RegexExecFlags::NotInitialNull and m_pos == m_begin)) (flags & RegexExecFlags::NotInitialNull and m_pos == m_begin))
{ {
release_saves(thread.saves); release_saves(thread.saves);
continue; continue;
} }
if (thread.saves) m_captures = thread.saves;
m_captures = thread.saves;
if (flags & RegexExecFlags::AnyMatch) if (flags & RegexExecFlags::AnyMatch)
return true; return true;
@ -325,8 +323,7 @@ struct ThreadedRegexVM
current_threads.pop_back(); current_threads.pop_back();
if (step(thread, current_threads) == StepResult::Matched) if (step(thread, current_threads) == StepResult::Matched)
{ {
if (thread.saves) m_captures = thread.saves;
m_captures = thread.saves;
return true; return true;
} }
} }