beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-26 01:20:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

LibRegex: Allow dollar signs in ECMA262 named capture groups

Browse source 
Fixes 1 test262 test.
This commit is contained in:
Timothy Flynn 2021-07-06 11:09:46 -04:00 committed by Linus Groh
parent d3a2e492fb
commit 65003241e4
Notes: sideshowbarker 2024-07-18 10:16:25 +09:00 
Author: https://github.com/trflynn89
Commit: https://github.com/SerenityOS/serenity/commit/65003241e40
Pull-request: https://github.com/SerenityOS/serenity/pull/8505
3 changed files with 25 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
Tests/LibRegex/Regex.cpp
View file

@ -422,6 +422,27 @@ TEST_CASE(named_capture_group)
EXPECT_EQ(result.named_capture_group_matches.at(1).ensure("Test").view, "0");
}
TEST_CASE(ecma262_named_capture_group_with_dollar_sign)
{
Regex<ECMA262> re("[a-zA-Z]*=(?<$Test$>[0-9]*)");
RegexResult result;
if constexpr (REGEX_DEBUG) {
RegexDebug regex_dbg(stderr);
regex_dbg.print_raw_bytecode(re);
regex_dbg.print_header();
regex_dbg.print_bytecode(re);
}
String haystack = "[Window]\nOpacity=255\nAudibleBeep=0\n";
EXPECT_EQ(re.search(haystack, result, ECMAScriptFlags::Multiline), true);
EXPECT_EQ(result.count, 2u);
EXPECT_EQ(result.matches.at(0).view, "Opacity=255");
EXPECT_EQ(result.named_capture_group_matches.at(0).ensure("$Test$").view, "255");
EXPECT_EQ(result.matches.at(1).view, "AudibleBeep=0");
EXPECT_EQ(result.named_capture_group_matches.at(1).ensure("$Test$").view, "0");
}
TEST_CASE(a_star)
{
Regex<PosixExtended> re("a*");

3
Userland/Libraries/LibJS/Tests/builtins/String/String.prototype.replace.js
View file

@ -138,6 +138,9 @@ test("replacement with substitution", () => {
expect("abc".replace(/(?<val1>a)b(?<val2>c)/, "$<val1>")).toBe("a");
expect("abc".replace(/(?<val1>a)b(?<val2>c)/, "$<val2>")).toBe("c");
expect("abc".replace(/(?<val1>a)b(?<val2>c)/, "$<val2>b$<val1>")).toBe("cba");
expect(/(?<𝒜>b)/u[Symbol.replace]("abc", "d$<𝒜>$`")).toBe("adbac");
expect(/(?<$𐒤>b)/gu[Symbol.replace]("abc", "$'$<$𐒤>d")).toBe("acbdc");
});
test("replacement with substitution and 'groups' coerced to an object", () => {

2
Userland/Libraries/LibRegex/RegexParser.cpp
View file

@ -1625,7 +1625,7 @@ StringView ECMA262Parser::read_capture_group_specifier(bool take_starting_angle_
auto start_token = m_parser_state.current_token;
size_t offset = 0;
while (match(TokenType::Char)) {
while (match(TokenType::Char) || match(TokenType::Dollar)) {
auto c = m_parser_state.current_token.value();
if (c == ">")
break;