beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-26 09:30:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

LibRegex: Allocate entries for all capture groups in RegexResult

Browse source 
Not just the seen ones.
Fixes #6108.
This commit is contained in:
AnotherTest 2021-04-04 15:59:35 +04:30 committed by Andreas Kling
parent ef8f8f47ac
commit 76f63c2980
Notes: sideshowbarker 2024-07-18 20:50:19 +09:00 
Author: https://github.com/alimpfard
Commit: https://github.com/SerenityOS/serenity/commit/76f63c29805
Pull-request: https://github.com/SerenityOS/serenity/pull/6113
Issue: https://github.com/SerenityOS/serenity/issues/6108
2 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Userland/Libraries/LibJS/Tests/builtins/RegExp/RegExp.prototype.exec.js
View file

@ -88,3 +88,15 @@ test("Future group backreference, #6039", () => {
expect(result[3]).toBe("a"); expect(result[3]).toBe("a");
expect(result.index).toBe(1); expect(result.index).toBe(1);
}); });
// #6108
test("optionally seen capture group", () => {
let rmozilla = /(mozilla)(?:.*? rv:([\w.]+))?/;
let ua = "mozilla/4.0 (serenityos; x86) libweb+libjs (not khtml, nor gecko) libweb";
let res = rmozilla.exec(ua);
expect(res.length).toBe(3);
expect(res[0]).toBe("mozilla");
expect(res[1]).toBe("mozilla");
expect(res[2]).toBeUndefined();
});

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

@ -253,36 +253,24 @@ RegexResult Matcher<Parser>::match(const Vector<RegexStringView> views, Optional
MatchOutput output_copy; MatchOutput output_copy;
if (match_count) { if (match_count) {
auto capture_groups_count = min(output.capture_group_matches.size(), output.matches.size()); output_copy.capture_group_matches = output.capture_group_matches;
for (size_t i = 0; i < capture_groups_count; ++i) { for (auto& matches : output_copy.capture_group_matches)
if (input.regex_options.has_flag_set(AllFlags::SkipTrimEmptyMatches)) { matches.resize(m_pattern.parser_result.capture_groups_count + 1);
output_copy.capture_group_matches.append(output.capture_group_matches.at(i)); if (!input.regex_options.has_flag_set(AllFlags::SkipTrimEmptyMatches)) {
} else { for (auto& matches : output_copy.capture_group_matches)
Vector<Match> capture_group_matches; matches.template remove_all_matching([](auto& match) { return match.view.is_null(); });
for (size_t j = 0; j < output.capture_group_matches.at(i).size(); ++j) {
if (!output.capture_group_matches.at(i).at(j).view.is_null())
capture_group_matches.append(output.capture_group_matches.at(i).at(j));
}
output_copy.capture_group_matches.append(capture_group_matches);
}
} }
auto named_capture_groups_count = min(output.named_capture_group_matches.size(), output.matches.size()); output_copy.named_capture_group_matches = output.named_capture_group_matches;
for (size_t i = 0; i < named_capture_groups_count; ++i) {
if (output.matches.at(i).view.length())
output_copy.named_capture_group_matches.append(output.named_capture_group_matches.at(i));
}
for (size_t i = 0; i < match_count; ++i)
output_copy.matches.append(output.matches.at(i));
output_copy.matches = output.matches;
} else { } else {
output_copy.capture_group_matches.clear_with_capacity(); output_copy.capture_group_matches.clear_with_capacity();
output_copy.named_capture_group_matches.clear_with_capacity(); output_copy.named_capture_group_matches.clear_with_capacity();
} }
return { return {
match_count ? true : false, match_count != 0,
match_count, match_count,
move(output_copy.matches), move(output_copy.matches),
move(output_copy.capture_group_matches), move(output_copy.capture_group_matches),