RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 02:57:44 +00:00
Code Issues Activity Actions

LibRegex: Do not attempt to find more matches when one match is needed

Browse source
This commit is contained in:
Ali Mohammad Pur 2021-04-23 03:54:26 +04:30 • committed by Linus Groh
parent 2ef5b138ee
commit bb40d4d5ff
1 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Userland/Libraries/LibRegex/RegexMatcher.cpp
View file

@ -133,6 +133,7 @@ RegexResult Matcher<Parser>::match(const Vector<RegexStringView> views, Optional
auto view_length = view.length(); auto view_length = view.length();
size_t view_index = m_pattern.start_offset; size_t view_index = m_pattern.start_offset;
state.string_position = view_index; state.string_position = view_index;
bool succeeded = false;
if (view_index == view_length && m_pattern.parser_result.match_length_minimum == 0) { if (view_index == view_length && m_pattern.parser_result.match_length_minimum == 0) {
// Run the code until it tries to consume something. // Run the code until it tries to consume something.
@ -182,6 +183,7 @@ RegexResult Matcher<Parser>::match(const Vector<RegexStringView> views, Optional
return { false, 0, {}, {}, {}, output.operations }; return { false, 0, {}, {}, {}, output.operations };
if (success.value()) { if (success.value()) {
succeeded = true;
if (input.regex_options.has_flag_set(AllFlags::MatchNotEndOfLine) && state.string_position == input.view.length()) { if (input.regex_options.has_flag_set(AllFlags::MatchNotEndOfLine) && state.string_position == input.view.length()) {
if (!continue_search) if (!continue_search)
@ -229,6 +231,9 @@ RegexResult Matcher<Parser>::match(const Vector<RegexStringView> views, Optional
if (input.regex_options.has_flag_set(AllFlags::Internal_Stateful)) if (input.regex_options.has_flag_set(AllFlags::Internal_Stateful))
m_pattern.start_offset = state.string_position; m_pattern.start_offset = state.string_position;
if (succeeded && !continue_search)
break;
} }
MatchOutput output_copy; MatchOutput output_copy;