From bd6581fe22eb41541c1711ee63194c790ab3a09a Mon Sep 17 00:00:00 2001
From: Shannon Booth <shannon@serenityos.org>
Date: Thu, 10 Jul 2025 21:10:00 +1200
Subject: [PATCH] LibRegex: Correctly use ClassSetReservedPunctuator in
 ClassSetCharacter

We had typo'd using ClassSetReservedDoublePunctuator which was
resulting in a parse error for the regex:

([^\\:]+?)

With the 'v' flag set.

Co-Authored-By: Ali Mohammad Pur <mpfard@serenityos.org>
---
 Libraries/LibRegex/RegexParser.cpp |  6 +++++-
 Tests/LibRegex/TestRegex.cpp       | 18 ++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/Libraries/LibRegex/RegexParser.cpp b/Libraries/LibRegex/RegexParser.cpp
index 29b4ebacb72..f8685777252 100644
--- a/Libraries/LibRegex/RegexParser.cpp
+++ b/Libraries/LibRegex/RegexParser.cpp
@@ -2266,6 +2266,10 @@ Optional<u32> ECMA262Parser::parse_class_set_character()
         "&&"sv, "!!"sv, "##"sv, "$$"sv, "%%"sv, "**"sv, "++"sv, ",,"sv, ".."sv, "::"sv, ";;"sv, "<<"sv, "=="sv, ">>"sv, "??"sv, "@@"sv, "^^"sv, "``"sv, "~~"sv
     };
 
+    constexpr auto class_set_reserved_punctuator = Array {
+        "&"sv, "-"sv, "!"sv, "#"sv, "%"sv, ","sv, ":"sv, ";"sv, "<"sv, "="sv, ">"sv, "@"sv, "`"sv, "~"sv
+    };
+
     if (done()) {
         set_error(Error::InvalidPattern);
         return {};
@@ -2281,7 +2285,7 @@ Optional<u32> ECMA262Parser::parse_class_set_character()
         }
 
         // "\" ClassSetReservedPunctuator
-        for (auto const& reserved : class_set_reserved_double_punctuator) {
+        for (auto const& reserved : class_set_reserved_punctuator) {
             if (try_skip(reserved)) {
                 // "\" ClassSetReservedPunctuator (ClassSetReservedPunctuator)
                 back();
diff --git a/Tests/LibRegex/TestRegex.cpp b/Tests/LibRegex/TestRegex.cpp
index a45689095ab..762aa1f9511 100644
--- a/Tests/LibRegex/TestRegex.cpp
+++ b/Tests/LibRegex/TestRegex.cpp
@@ -753,6 +753,23 @@ TEST_CASE(ECMA262_match)
     }
 }
 
+TEST_CASE(ECMA262_unicode_parser_error)
+{
+    struct _test {
+        StringView pattern;
+        regex::Error error;
+    };
+
+    constexpr _test tests[] {
+        { "([^\\:]+?)"sv, regex::Error::InvalidPattern },
+    };
+
+    for (auto test : tests) {
+        Regex<ECMA262> re(test.pattern, (ECMAScriptFlags)regex::AllFlags::Unicode);
+        EXPECT_EQ(re.parser_result.error, test.error);
+    }
+}
+
 TEST_CASE(ECMA262_unicode_match)
 {
     constexpr auto space_and_line_terminator_code_points = Array { 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x0020, 0x00A0, 0x1680, 0x2000, 0x2001, 0x2002, 0x2003, 0x2004, 0x2005, 0x2006, 0x2007, 0x2008, 0x2009, 0x200A, 0x2028, 0x2029, 0x202F, 0x205F, 0x3000, 0xFEFF };
@@ -859,6 +876,7 @@ TEST_CASE(ECMA262_unicode_sets_match)
         { "[[0-9\\w]--x--6]"sv, "9"sv, true },
         { "[\\w&&\\d]"sv, "a"sv, false },
         { "[\\w&&\\d]"sv, "4"sv, true },
+        { "([^\\:]+?)"sv, "a"sv, true },
     };
 
     for (auto& test : tests) {