[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da
barraclough at apple.com
barraclough at apple.com
Wed Dec 22 17:51:50 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 727c9e6ffc439da029ddbbbfe2f4a0df19df4271
Author: barraclough at apple.com <barraclough at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Dec 1 20:04:22 2010 +0000
Bug 50297 - \s in YARR should match BOMs.
Rubber stamped by Sam Weinig.
JavaScriptCore:
* create_regex_tables:
LayoutTests:
This exposes a Sputnik bug, tracked by:
http://code.google.com/p/sputniktests/issues/detail?id=34
Checking in expected failing results.
* fast/js/sputnik/Conformance/15_Native_Objects/15.10_RegExp/15.10.2/15.10.2.12_CharacterClassEscape/S15.10.2.12_A1_T1-expected.txt:
* fast/js/sputnik/Conformance/15_Native_Objects/15.10_RegExp/15.10.2/15.10.2.12_CharacterClassEscape/S15.10.2.12_A2_T1-expected.txt:
* fast/regex/script-tests/pcre-test-1.js:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73056 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 7df9712..559461a 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,29 @@
+2010-12-01 Gavin Barraclough <barraclough at apple.com>
+
+ Rubber stamped by Sam Weinig.
+
+ Bug 50297 - \s in YARR should match BOMs.
+
+ * create_regex_tables:
+
+2010-11-30 Gavin Barraclough <barraclough at apple.com>
+
+ Rubber stamped by Sam Weinig.
+
+ Bug 50297 - \s in YARR should match BOMs.
+
+ From section 15.10.2.12 CharacterClassEscape contains:
+
+ The production CharacterClassEscape :: s evaluates by returning the set of characters containing the
+ characters that are on the right-hand side of the WhiteSpace (7.2) or LineTerminator (7.3) productions.
+
+ Table 2 in section 7.2 contains:
+
+ \uFEFF Byte Order Mark <BOM>
+
+ * create_regex_tables:
+ Add BOM to spaces table.
+
2010-11-30 Gavin Barraclough <barraclough at apple.com>
Reviewed by Darin Adler.
diff --git a/JavaScriptCore/create_regex_tables b/JavaScriptCore/create_regex_tables
index b436eee..d1cc1c2 100644
--- a/JavaScriptCore/create_regex_tables
+++ b/JavaScriptCore/create_regex_tables
@@ -25,8 +25,8 @@ types = {
"wordchar": { "UseTable" : True, "data": ['_', ('0','9'), ('A', 'Z'), ('a','z')]},
"nonwordchar": { "UseTable" : True, "Inverse": "wordchar", "data": ['`', (0, ord('0') - 1), (ord('9') + 1, ord('A') - 1), (ord('Z') + 1, ord('_') - 1), (ord('z') + 1, 0xffff)]},
"newline": { "UseTable" : False, "data": ['\n', '\r', 0x2028, 0x2029]},
- "spaces": { "UseTable" : True, "data": [' ', ('\t', '\r'), 0xa0, 0x1680, 0x180e, 0x2028, 0x2029, 0x202f, 0x205f, 0x3000, (0x2000, 0x200a)]},
- "nonspaces": { "UseTable" : True, "Inverse": "spaces", "data": [(0, ord('\t') - 1), (ord('\r') + 1, ord(' ') - 1), (ord(' ') + 1, 0x009f), (0x00a1, 0x167f), (0x1681, 0x180d), (0x180f, 0x1fff), (0x200b, 0x2027), (0x202a, 0x202e), (0x2030, 0x205e), (0x2060, 0x2fff), (0x3001, 0xffff)]},
+ "spaces": { "UseTable" : True, "data": [' ', ('\t', '\r'), 0xa0, 0x1680, 0x180e, 0x2028, 0x2029, 0x202f, 0x205f, 0x3000, (0x2000, 0x200a), 0xfeff]},
+ "nonspaces": { "UseTable" : True, "Inverse": "spaces", "data": [(0, ord('\t') - 1), (ord('\r') + 1, ord(' ') - 1), (ord(' ') + 1, 0x009f), (0x00a1, 0x167f), (0x1681, 0x180d), (0x180f, 0x1fff), (0x200b, 0x2027), (0x202a, 0x202e), (0x2030, 0x205e), (0x2060, 0x2fff), (0x3001, 0xfefe), (0xff00, 0xffff)]},
"digits": { "UseTable" : False, "data": [('0', '9')]},
"nondigits": { "UseTable" : False, "Inverse": "digits", "data": [(0, ord('0') - 1), (ord('9') + 1, 0xffff)] }
}
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index e121006..6d2d007 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,17 @@
+2010-12-01 Gavin Barraclough <barraclough at apple.com>
+
+ Rubber stamped by Sam Weinig.
+
+ Bug 50297 - \s in YARR should match BOMs.
+
+ This exposes a Sputnik bug, tracked by:
+ http://code.google.com/p/sputniktests/issues/detail?id=34
+ Checking in expected failing results.
+
+ * fast/js/sputnik/Conformance/15_Native_Objects/15.10_RegExp/15.10.2/15.10.2.12_CharacterClassEscape/S15.10.2.12_A1_T1-expected.txt:
+ * fast/js/sputnik/Conformance/15_Native_Objects/15.10_RegExp/15.10.2/15.10.2.12_CharacterClassEscape/S15.10.2.12_A2_T1-expected.txt:
+ * fast/regex/script-tests/pcre-test-1.js:
+
2010-12-01 Dan Bernstein <mitz at apple.com>
Re-added Leopard-specific results for editing/text-iterator/findString.html. In the Leopard version
diff --git a/LayoutTests/fast/js/sputnik/Conformance/15_Native_Objects/15.10_RegExp/15.10.2/15.10.2.12_CharacterClassEscape/S15.10.2.12_A1_T1-expected.txt b/LayoutTests/fast/js/sputnik/Conformance/15_Native_Objects/15.10_RegExp/15.10.2/15.10.2.12_CharacterClassEscape/S15.10.2.12_A1_T1-expected.txt
index 80e63c6..dd66b3d 100644
--- a/LayoutTests/fast/js/sputnik/Conformance/15_Native_Objects/15.10_RegExp/15.10.2/15.10.2.12_CharacterClassEscape/S15.10.2.12_A1_T1-expected.txt
+++ b/LayoutTests/fast/js/sputnik/Conformance/15_Native_Objects/15.10_RegExp/15.10.2/15.10.2.12_CharacterClassEscape/S15.10.2.12_A1_T1-expected.txt
@@ -1,6 +1,6 @@
S15.10.2.12_A1_T1
-PASS
+FAIL SputnikError: #63: Error matching character class s between character fc00 and ffff
TEST COMPLETE
diff --git a/LayoutTests/fast/js/sputnik/Conformance/15_Native_Objects/15.10_RegExp/15.10.2/15.10.2.12_CharacterClassEscape/S15.10.2.12_A2_T1-expected.txt b/LayoutTests/fast/js/sputnik/Conformance/15_Native_Objects/15.10_RegExp/15.10.2/15.10.2.12_CharacterClassEscape/S15.10.2.12_A2_T1-expected.txt
index 429128c..a4e01a2 100644
--- a/LayoutTests/fast/js/sputnik/Conformance/15_Native_Objects/15.10_RegExp/15.10.2/15.10.2.12_CharacterClassEscape/S15.10.2.12_A2_T1-expected.txt
+++ b/LayoutTests/fast/js/sputnik/Conformance/15_Native_Objects/15.10_RegExp/15.10.2/15.10.2.12_CharacterClassEscape/S15.10.2.12_A2_T1-expected.txt
@@ -1,6 +1,6 @@
S15.10.2.12_A2_T1
-PASS
+FAIL SputnikError: #63: Error matching character class S between character fc00 and ffff
TEST COMPLETE
diff --git a/LayoutTests/fast/regex/script-tests/pcre-test-1.js b/LayoutTests/fast/regex/script-tests/pcre-test-1.js
index c24d249..4e186fa 100644
--- a/LayoutTests/fast/regex/script-tests/pcre-test-1.js
+++ b/LayoutTests/fast/regex/script-tests/pcre-test-1.js
@@ -4939,18 +4939,14 @@ var input0 = "> \x09\x0a\x0c\x0d\x0b<";
var results = [" "];
shouldBe('regex611.exec(input0);', 'results');
-// FIXME: Per inclusion of BOM as a WS character in the ECMA 5 spec, this too should pass.
-// https://bugs.webkit.org/show_bug.cgi?id=50297
var regex612 = /[\s]+/;
var input0 = "> \x09\x0a\x0b\x0c\x0d\x20\xA0\u2028\u2029\uFEFF<";
-var results = [" \x09\x0a\x0b\x0c\x0d\x20\xA0\u2028\u2029"];
+var results = [" \x09\x0a\x0b\x0c\x0d\x20\xA0\u2028\u2029\uFEFF"];
shouldBe('regex612.exec(input0);', 'results');
-// FIXME: Per inclusion of BOM as a WS character in the ECMA 5 spec, this too should pass.
-// https://bugs.webkit.org/show_bug.cgi?id=50297
var regex613 = /\s+/;
var input0 = "> \x09\x0a\x0b\x0c\x0d\x20\xA0\u2028\u2029\uFEFF<";
-var results = [" \x09\x0a\x0b\x0c\x0d\x20\xA0\u2028\u2029"];
+var results = [" \x09\x0a\x0b\x0c\x0d\x20\xA0\u2028\u2029\uFEFF"];
shouldBe('regex613.exec(input0);', 'results');
var regex614 = /ab/;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list