RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2026-01-12 23:01:01 +00:00
Code Issues Activity Actions

LibRegex: Do not continue searching input when the sticky bit is set

Browse source 
This partially reverts commit a962ee020a.

When the sticky bit is set, the global bit should basically be ignored
except by external callers who want their own special behavior. For
example, RegExp.prototype [ @@match ] will use the global flag to
accumulate consecutive matches. But on the first failure, the regex
loop should break.
This commit is contained in:
Timothy Flynn 2022-02-05 09:12:43 -05:00 • committed by Ali Mohammad Pur
parent 222e580fa8
commit 27d3de1f17
2 changed files with 15 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Userland/Libraries/LibJS/Tests/builtins/String/String.prototype.match.js
View file

@ -70,3 +70,11 @@ test("escaped code points", () => {
expect(string.match(re).groups.𝓑𝓻𝓸𝔀𝓷).toBe("brown");
expect(string.match(re).groups.𝓑𝓻𝓸𝔀𝓷).toBe("brown");
});
test("sticky and global flag set", () => {
const string = "aaba";
expect(string.match(/a/)).toEqual(["a"]);
expect(string.match(/a/y)).toEqual(["a"]);
expect(string.match(/a/g)).toEqual(["a", "a", "a"]);
expect(string.match(/a/gy)).toEqual(["a", "a"]);
});

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

@ -180,6 +180,8 @@ RegexResult Matcher<Parser>::match(Vector<RegexStringView> const& views, Optiona
#endif
bool continue_search = input.regex_options.has_flag_set(AllFlags::Global) || input.regex_options.has_flag_set(AllFlags::Multiline);
if (input.regex_options.has_flag_set(AllFlags::Sticky))
continue_search = false;
auto single_match_only = input.regex_options.has_flag_set(AllFlags::SingleMatch);
@ -280,7 +282,11 @@ RegexResult Matcher<Parser>::match(Vector<RegexStringView> const& views, Optiona
break;
continue;
}
if (state.string_position < view_length && !input.regex_options.has_flag_set(AllFlags::Internal_Stateful)) {
if (input.regex_options.has_flag_set(AllFlags::Internal_Stateful)) {
append_match(input, state, view_index);
break;
}
if (state.string_position < view_length) {
return { false, 0, {}, {}, {}, operations };
}