Changeset 258976 in webkit

Timestamp:

Mar 25, 2020 4:11:47 AM (4 years ago)

Author:

Alexey Shvayka

Message:

\b escapes inside character classes should be valid in Unicode patterns
​https://bugs.webkit.org/show_bug.cgi?id=209528

Reviewed by Darin Adler.

JSTests:

• test262/expectations.yaml: Mark 2 test cases as passing.

Source/JavaScriptCore:

This change removes isIdentityEscapeAnError('b') check, allowing \b escapes
inside character classes in Unicode patterns match U+0008 (BACKSPACE) characters,
aligning JSC with V8 and SpiderMonkey.

Grammar: ​https://tc39.es/ecma262/#prod-ClassEscape
('b' comes before CharacterEscape :: IdentityEscape)

• yarr/YarrParser.h:

(JSC::Yarr::Parser::parseEscape):

LayoutTests:

• js/regexp-unicode-expected.txt:
• js/script-tests/regexp-unicode.js:

Location:

trunk

Files:

• JSTests/ChangeLog (modified) (1 diff)
• JSTests/test262/expectations.yaml (modified) (1 diff)
• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/js/regexp-unicode-expected.txt (modified) (1 diff)
• LayoutTests/js/script-tests/regexp-unicode.js (modified) (1 diff)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/yarr/YarrParser.h (modified) (1 diff)

trunk/JSTests/ChangeLog

@@ +1 @@
+2020-03-25  Alexey Shvayka  <shvaikalesh@gmail.com>
+
+        \b escapes inside character classes should be valid in Unicode patterns
+        https://bugs.webkit.org/show_bug.cgi?id=209528
+
+        Reviewed by Darin Adler.
+
+        * test262/expectations.yaml: Mark 2 test cases as passing.
+
 2020-03-24  Tadeu Zagallo  <tzagallo@apple.com>
 

trunk/JSTests/test262/expectations.yaml

@@ -1712 +1712 @@
   default: 'SyntaxError: Invalid regular expression: number too large in {} quantifier'
   strict mode: 'SyntaxError: Invalid regular expression: number too large in {} quantifier'
-test/built-ins/RegExp/unicode_character_class_backspace_escape.js:
-  default: 'SyntaxError: Invalid regular expression: invalid escaped character for Unicode pattern'
-  strict mode: 'SyntaxError: Invalid regular expression: invalid escaped character for Unicode pattern'
 test/built-ins/RegExp/unicode_restricted_identity_escape_alpha.js:
   default: "Test262Error: IdentityEscape in AtomEscape: 'k' Expected a SyntaxError to be thrown but no exception was thrown at all"

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2020-03-25  Alexey Shvayka  <shvaikalesh@gmail.com>
+
+        \b escapes inside character classes should be valid in Unicode patterns
+        https://bugs.webkit.org/show_bug.cgi?id=209528
+
+        Reviewed by Darin Adler.
+
+        * js/regexp-unicode-expected.txt:
+        * js/script-tests/regexp-unicode.js:
+
 2020-03-24  Zalan Bujtas  <zalan@apple.com>
 

trunk/LayoutTests/js/regexp-unicode-expected.txt

@@ -188 +188 @@
 PASS r = new RegExp("\\a", "u") threw exception SyntaxError: Invalid regular expression: invalid escaped character for Unicode pattern.
 PASS r = new RegExp("[\\a]", "u") threw exception SyntaxError: Invalid regular expression: invalid escaped character for Unicode pattern.
-PASS r = new RegExp("[\\b]", "u") threw exception SyntaxError: Invalid regular expression: invalid escaped character for Unicode pattern.
 PASS r = new RegExp("[\\B]", "u") threw exception SyntaxError: Invalid regular expression: invalid escaped character for Unicode pattern.
 PASS r = new RegExp("\\x", "u") threw exception SyntaxError: Invalid regular expression: invalid escaped character for Unicode pattern.

trunk/LayoutTests/js/script-tests/regexp-unicode.js

@@ -248 +248 @@
 shouldThrowInvalidEscape("\\\\a");
 shouldThrowInvalidEscape("[\\\\a]");
-shouldThrowInvalidEscape("[\\\\b]");
 shouldThrowInvalidEscape("[\\\\B]");
 shouldThrowInvalidEscape("\\\\x");

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2020-03-25  Alexey Shvayka  <shvaikalesh@gmail.com>
+
+        \b escapes inside character classes should be valid in Unicode patterns
+        https://bugs.webkit.org/show_bug.cgi?id=209528
+
+        Reviewed by Darin Adler.
+
+        This change removes isIdentityEscapeAnError('b') check, allowing \b escapes
+        inside character classes in Unicode patterns match U+0008 (BACKSPACE) characters,
+        aligning JSC with V8 and SpiderMonkey.
+
+        Grammar: https://tc39.es/ecma262/#prod-ClassEscape
+        ('b' comes before CharacterEscape :: IdentityEscape)
+
+        * yarr/YarrParser.h:
+        (JSC::Yarr::Parser::parseEscape):
+
 2020-03-24  Ross Kirsling  <ross.kirsling@sony.com>
 

trunk/Source/JavaScriptCore/yarr/YarrParser.h

@@ -276 +276 @@
         case 'b':
             consume();
-            if (inCharacterClass) {
-                if (isIdentityEscapeAnError('b'))
-                    break;
-
+            if (inCharacterClass)
                 delegate.atomPatternCharacter('\b');
-            } else {
+            else {
                 delegate.assertionWordBoundary(false);
                 return false;