Changeset 17862 in webkit for trunk/JavaScriptCore/kjs/regexp.h

Timestamp:

Nov 20, 2006, 12:24:22 PM (19 years ago)

Author:

ap

Message:

2006-11-20 W. Andy Carrel <​[email protected]>

Reviewed by Maciej.

​http://bugs.webkit.org/show_bug.cgi?id=11501
REGRESSION: \u no longer escapes metacharacters in RegExps
​http://bugs.webkit.org/show_bug.cgi?id=11502
Serializing RegExps doesn't preserve Unicode escapes

JavaScriptCore:

• kjs/lexer.cpp: (Lexer::Lexer): (Lexer::setCode): (Lexer::shift): (Lexer::scanRegExp): Push \u parsing back down into the RegExp object rather than in the parser. This backs out r17354 in favor of a new fix that better matches the behavior of other browsers.

• kjs/lexer.h:
• kjs/regexp.cpp: (KJS::RegExp::RegExp): (KJS::sanitizePattern): (KJS::isHexDigit): (KJS::convertHex): (KJS::convertUnicode):
• kjs/regexp.h: Translate \u escaped unicode characters for the benefit of pcre.

• kjs/ustring.cpp: (KJS::UString::append): Fix failure to increment length on the first UChar appended to a UString that was copy-on-write.

• tests/mozilla/ecma_2/RegExp/properties-001.js: Adjust tests back to the uniform standards.

LayoutTests:

• fast/js/kde/RegExp-expected.txt:
• fast/js/regexp-unicode-handling-expected.txt: Adjust these test results to passing as a result of other included changes in this revision.

File:

• trunk/JavaScriptCore/kjs/regexp.h (modified) (1 diff)

trunk/JavaScriptCore/kjs/regexp.h

@@ -62 +62 @@
     RegExp(const RegExp &);
     RegExp &operator=(const RegExp &);
+
+    static UString sanitizePattern(const UString&);
+
+    static bool isHexDigit(UChar);
+    static unsigned char convertHex(int);
+    static unsigned char convertHex(int, int);
+    static UChar convertUnicode(UChar, UChar, UChar, UChar);
   };