Changeset 80743 in webkit for trunk/Source/JavaScriptCore/tests

Timestamp:

Mar 10, 2011, 12:31:21 PM (14 years ago)

Author:

[email protected]

Message:

Bug 56077 - ES5 conformance issues with RegExp.prototype

Reviewed by Oliver Hunt.

There are three issues causing test failures in sputnik.

(1) lastIndex should be converted at the point it is used, not the point it is set (this is visible if valueOf is overridden).
(2) The 'length' property of the test/exec functions should be 1.
(3) If no input is specified, the input to test()/exec() is "undefined" (i.e. ToString(undefined)) - not RegExp.input.

Source/JavaScriptCore:

• runtime/RegExpObject.cpp:

(JSC::RegExpObject::markChildren):

• Added to mark lastIndex

(JSC::regExpObjectLastIndex):
(JSC::setRegExpObjectLastIndex):

• lastIndex is now stored as a JSValue.

(JSC::RegExpObject::match):

• Use accessor methods to get/set lastIndex, add fast case for isUInt32 (don't convert to double).

• runtime/RegExpObject.h:

(JSC::RegExpObject::setLastIndex):
(JSC::RegExpObject::setLastIndex):

• Set lastIndex, either from a size_t or a JSValue.

(JSC::RegExpObject::getLastIndex):

• Get lastIndex.

(JSC::RegExpObject::RegExpObjectData::RegExpObjectData):

• Initialize as a JSValue.

• runtime/RegExpPrototype.cpp:

(JSC::RegExpPrototype::RegExpPrototype):

• Add test/exec properties with length 1.

• runtime/StringPrototype.cpp:

(JSC::stringProtoFuncMatch):
(JSC::stringProtoFuncSearch):

• Do not read RegExp.input if none is provided.

• tests/mozilla/js1_2/regexp/RegExp_input.js:
• tests/mozilla/js1_2/regexp/RegExp_input_as_array.js:
  • Update these tests (they relied on non-ES5 behaviour).

LayoutTests:

• fast/js/kde/function_length-expected.txt:
• fast/js/kde/script-tests/function_length.js:
  • 'length' of RexExp.test/RexExp.exec is 1
• fast/js/regexp-caching-expected.txt:
• fast/js/regexp-test-null-string-expected.txt:
• fast/js/regexp-test-null-string.html:
  • test() is equivalent to test("undefined")
• sputnik/Conformance/15_Native_Objects/15.10_RegExp/15.10.6/15.10.6.2_RegExp.prototype.exec/S15.10.6.2_A11-expected.txt:
• sputnik/Conformance/15_Native_Objects/15.10_RegExp/15.10.6/15.10.6.2_RegExp.prototype.exec/S15.10.6.2_A1_T16-expected.txt:
• sputnik/Conformance/15_Native_Objects/15.10_RegExp/15.10.6/15.10.6.2_RegExp.prototype.exec/S15.10.6.2_A4_T11-expected.txt:
• sputnik/Conformance/15_Native_Objects/15.10_RegExp/15.10.6/15.10.6.3_RegExp.prototype.test/S15.10.6.3_A11-expected.txt:
• sputnik/Conformance/15_Native_Objects/15.10_RegExp/15.10.6/15.10.6.3_RegExp.prototype.test/S15.10.6.3_A1_T16-expected.txt:
  • These tests now pass!

Location:

trunk/Source/JavaScriptCore/tests/mozilla/js1_2/regexp

Files:

• RegExp_input.js (modified) (2 diffs)
• RegExp_input_as_array.js (modified) (2 diffs)

trunk/Source/JavaScriptCore/tests/mozilla/js1_2/regexp/RegExp_input.js

@@ -51 +51 @@
                                             String(["2345"]), String(/\d+/.exec('2345')));
 
-    // RegExp.input = "abcd12357efg"; /\d+/.exec()
+    // RegExp.input = "abcd12357efg"; /\d+/.exec(RegExp.input)
     RegExp.input = "abcd12357efg";
-        testcases[count++] = new TestCase ( SECTION, "RegExp.input = 'abcd12357efg'; /\\d+/.exec()",
-                                            String(["12357"]), String(/\d+/.exec()));
+        testcases[count++] = new TestCase ( SECTION, "RegExp.input = 'abcd12357efg'; /\\d+/.exec(RegExp.input)",
+                                            String(["12357"]), String(/\d+/.exec(RegExp.input)));
 
-    // RegExp.input = "abcd12357efg"; /[h-z]+/.exec()
+    // RegExp.input = "abcd12357efg"; /[h-z]+/.exec(RegExp.input)
     RegExp.input = "abcd12357efg";
-        testcases[count++] = new TestCase ( SECTION, "RegExp.input = 'abcd12357efg'; /[h-z]+/.exec()",
-                                            null, /[h-z]+/.exec());
+        testcases[count++] = new TestCase ( SECTION, "RegExp.input = 'abcd12357efg'; /[h-z]+/.exec(RegExp.input)",
+                                            null, /[h-z]+/.exec(RegExp.input));
 
     // RegExp.input = "abcd12357efg"; /\d+/.test('2345')
@@ -66 +66 @@
                                             true, /\d+/.test('2345'));
 
-    // RegExp.input = "abcd12357efg"; /\d+/.test()
+    // RegExp.input = "abcd12357efg"; /\d+/.test(RegExp.input)
     RegExp.input = "abcd12357efg";
-        testcases[count++] = new TestCase ( SECTION, "RegExp.input = 'abcd12357efg'; /\\d+/.test()",
-                                            true, /\d+/.test());
+        testcases[count++] = new TestCase ( SECTION, "RegExp.input = 'abcd12357efg'; /\\d+/.test(RegExp.input)",
+                                            true, /\d+/.test(RegExp.input));
 
-    // RegExp.input = "abcd12357efg"; (new RegExp('d+')).test()
+    // RegExp.input = "abcd12357efg"; (new RegExp('d+')).test(RegExp.input)
     RegExp.input = "abcd12357efg";
-        testcases[count++] = new TestCase ( SECTION, "RegExp.input = 'abcd12357efg'; (new RegExp('d+')).test()",
-                                            true, (new RegExp('d+')).test());
+        testcases[count++] = new TestCase ( SECTION, "RegExp.input = 'abcd12357efg'; (new RegExp('d+')).test(RegExp.input)",
+                                            true, (new RegExp('d+')).test(RegExp.input));
 
-    // RegExp.input = "abcd12357efg"; /[h-z]+/.test()
+    // RegExp.input = "abcd12357efg"; /[h-z]+/.test(RegExp.input)
     RegExp.input = "abcd12357efg";
-        testcases[count++] = new TestCase ( SECTION, "RegExp.input = 'abcd12357efg'; /[h-z]+/.test()",
-                                            false, /[h-z]+/.test());
+        testcases[count++] = new TestCase ( SECTION, "RegExp.input = 'abcd12357efg'; /[h-z]+/.test(RegExp.input)",
+                                            false, /[h-z]+/.test(RegExp.input));
 
-    // RegExp.input = "abcd12357efg"; (new RegExp('[h-z]+')).test()
+    // RegExp.input = "abcd12357efg"; (new RegExp('[h-z]+')).test(RegExp.input)
     RegExp.input = "abcd12357efg";
-        testcases[count++] = new TestCase ( SECTION, "RegExp.input = 'abcd12357efg'; (new RegExp('[h-z]+')).test()",
-                                            false, (new RegExp('[h-z]+')).test());
+        testcases[count++] = new TestCase ( SECTION, "RegExp.input = 'abcd12357efg'; (new RegExp('[h-z]+')).test(RegExp.input)",
+                                            false, (new RegExp('[h-z]+')).test(RegExp.input));
 
         function test()

trunk/Source/JavaScriptCore/tests/mozilla/js1_2/regexp/RegExp_input_as_array.js

@@ -51 +51 @@
                                             String(["2345"]), String(/\d+/.exec('2345')));
 
-    // RegExp['$_'] = "abcd12357efg"; /\d+/.exec()
+    // RegExp['$_'] = "abcd12357efg"; /\d+/.exec(RegExp.input)
     RegExp['$_'] = "abcd12357efg";
-        testcases[count++] = new TestCase ( SECTION, "RegExp['$_'] = 'abcd12357efg'; /\\d+/.exec()",
-                                            String(["12357"]), String(/\d+/.exec()));
+        testcases[count++] = new TestCase ( SECTION, "RegExp['$_'] = 'abcd12357efg'; /\\d+/.exec(RegExp.input)",
+                                            String(["12357"]), String(/\d+/.exec(RegExp.input)));
 
-    // RegExp['$_'] = "abcd12357efg"; /[h-z]+/.exec()
+    // RegExp['$_'] = "abcd12357efg"; /[h-z]+/.exec(RegExp.input)
     RegExp['$_'] = "abcd12357efg";
-        testcases[count++] = new TestCase ( SECTION, "RegExp['$_'] = 'abcd12357efg'; /[h-z]+/.exec()",
-                                            null, /[h-z]+/.exec());
+        testcases[count++] = new TestCase ( SECTION, "RegExp['$_'] = 'abcd12357efg'; /[h-z]+/.exec(RegExp.input)",
+                                            null, /[h-z]+/.exec(RegExp.input));
 
     // RegExp['$_'] = "abcd12357efg"; /\d+/.test('2345')
@@ -66 +66 @@
                                             true, /\d+/.test('2345'));
 
-    // RegExp['$_'] = "abcd12357efg"; /\d+/.test()
+    // RegExp['$_'] = "abcd12357efg"; /\d+/.test(RegExp.input)
     RegExp['$_'] = "abcd12357efg";
-        testcases[count++] = new TestCase ( SECTION, "RegExp['$_'] = 'abcd12357efg'; /\\d+/.test()",
-                                            true, /\d+/.test());
+        testcases[count++] = new TestCase ( SECTION, "RegExp['$_'] = 'abcd12357efg'; /\\d+/.test(RegExp.input)",
+                                            true, /\d+/.test(RegExp.input));
 
-    // RegExp['$_'] = "abcd12357efg"; /[h-z]+/.test()
+    // RegExp['$_'] = "abcd12357efg"; /[h-z]+/.test(RegExp.input)
     RegExp['$_'] = "abcd12357efg";
-        testcases[count++] = new TestCase ( SECTION, "RegExp['$_'] = 'abcd12357efg'; /[h-z]+/.test()",
-                                            false, /[h-z]+/.test());
+        testcases[count++] = new TestCase ( SECTION, "RegExp['$_'] = 'abcd12357efg'; /[h-z]+/.test(RegExp.input)",
+                                            false, /[h-z]+/.test(RegExp.input));
 
-    // RegExp['$_'] = "abcd12357efg"; (new RegExp('\d+')).test()
+    // RegExp['$_'] = "abcd12357efg"; (new RegExp('\d+')).test(RegExp.input)
     RegExp['$_'] = "abcd12357efg";
-        testcases[count++] = new TestCase ( SECTION, "RegExp['$_'] = 'abcd12357efg'; (new RegExp('\d+')).test()",
-                                            true, (new RegExp('\d+')).test());
+        testcases[count++] = new TestCase ( SECTION, "RegExp['$_'] = 'abcd12357efg'; (new RegExp('\d+')).test(RegExp.input)",
+                                            true, (new RegExp('\d+')).test(RegExp.input));
 
-    // RegExp['$_'] = "abcd12357efg"; (new RegExp('[h-z]+')).test()
+    // RegExp['$_'] = "abcd12357efg"; (new RegExp('[h-z]+')).test(RegExp.input)
     RegExp['$_'] = "abcd12357efg";
-        testcases[count++] = new TestCase ( SECTION, "RegExp['$_'] = 'abcd12357efg'; (new RegExp('[h-z]+')).test()",
-                                            false, (new RegExp('[h-z]+')).test());
+        testcases[count++] = new TestCase ( SECTION, "RegExp['$_'] = 'abcd12357efg'; (new RegExp('[h-z]+')).test(RegExp.input)",
+                                            false, (new RegExp('[h-z]+')).test(RegExp.input));
 
         function test()