[webkit-changes] [110540] trunk/Source/JavaScriptCore

Mon, 12 Mar 2012 23:16:11 -0700

Title: [110540] trunk/Source/_javascript_Core
Revision
110540
Author
[email protected]
Date
2012-03-12 23:15:58 -0700 (Mon, 12 Mar 2012)

Log Message

Fix test cases for RegExp multiline
https://bugs.webkit.org/show_bug.cgi?id=80822

Patch by Hojong Han <[email protected]> on 2012-03-12
Reviewed by Gavin Barraclough.

* tests/mozilla/js1_2/regexp/RegExp_multiline.js:
* tests/mozilla/js1_2/regexp/RegExp_multiline_as_array.js:
* tests/mozilla/js1_2/regexp/beginLine.js:
* tests/mozilla/js1_2/regexp/endLine.js:

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (110539 => 110540)


--- trunk/Source/_javascript_Core/ChangeLog	2012-03-13 05:38:59 UTC (rev 110539)
+++ trunk/Source/_javascript_Core/ChangeLog	2012-03-13 06:15:58 UTC (rev 110540)
@@ -1,3 +1,15 @@
+2012-03-12  Hojong Han  <[email protected]>
+
+        Fix test cases for RegExp multiline
+        https://bugs.webkit.org/show_bug.cgi?id=80822
+
+        Reviewed by Gavin Barraclough.
+
+        * tests/mozilla/js1_2/regexp/RegExp_multiline.js:
+        * tests/mozilla/js1_2/regexp/RegExp_multiline_as_array.js:
+        * tests/mozilla/js1_2/regexp/beginLine.js:
+        * tests/mozilla/js1_2/regexp/endLine.js:
+
 2012-03-12  Filip Pizlo  <[email protected]>
 
         Arithmetic use inference should be procedure-global and should run in tandem

Modified: trunk/Source/_javascript_Core/tests/mozilla/js1_2/regexp/RegExp_multiline.js (110539 => 110540)


--- trunk/Source/_javascript_Core/tests/mozilla/js1_2/regexp/RegExp_multiline.js	2012-03-13 05:38:59 UTC (rev 110539)
+++ trunk/Source/_javascript_Core/tests/mozilla/js1_2/regexp/RegExp_multiline.js	2012-03-13 06:15:58 UTC (rev 110540)
@@ -79,32 +79,32 @@
     // **Now we do the tests with RegExp.multiline set to true
     // RegExp.multiline = true; RegExp.multiline
     RegExp.multiline = true;
-	testcases[count++] = new TestCase ( SECTION, "RegExp.multiline = true; RegExp.multiline",
+    testcases[count++] = new TestCase ( SECTION, "RegExp.multiline = true; RegExp.multiline",
 	                                    true, RegExp.multiline);
 
     // (multiline == true) '123\n456'.match(/^4../)
-	testcases[count++] = new TestCase ( SECTION, "(multiline == true) '123\\n456'.match(/^4../)",
-	                                    String(['456']), String('123\n456'.match(/^4../)));
+    testcases[count++] = new TestCase ( SECTION, "(multiline == true) '123\\n456'.match(/^4../m)",
+                                        String(['456']), String('123\n456'.match(/^4../m)));
 
     // (multiline == true) 'a11\na22\na23\na24'.match(/^a../g)
-	testcases[count++] = new TestCase ( SECTION, "(multiline == true) 'a11\\na22\\na23\\na24'.match(/^a../g)",
-	                                    String(['a11','a22','a23','a24']), String('a11\na22\na23\na24'.match(/^a../g)));
+    testcases[count++] = new TestCase ( SECTION, "(multiline == true) 'a11\\na22\\na23\\na24'.match(/^a../gm)",
+                                        String(['a11','a22','a23','a24']), String('a11\na22\na23\na24'.match(/^a../gm)));
 
     // (multiline == true) 'a11\na22'.match(/^.+^./)
 	//testcases[count++] = new TestCase ( SECTION, "(multiline == true) 'a11\na22'.match(/^.+^./)",
 	//                                    String(['a11\na']), String('a11\na22'.match(/^.+^./)));
 
     // (multiline == true) '123\n456'.match(/.3$/)
-	testcases[count++] = new TestCase ( SECTION, "(multiline == true) '123\\n456'.match(/.3$/)",
-	                                    String(['23']), String('123\n456'.match(/.3$/)));
+    testcases[count++] = new TestCase ( SECTION, "(multiline == true) '123\\n456'.match(/.3$/m)",
+                                        String(['23']), String('123\n456'.match(/.3$/m)));
 
     // (multiline == true) 'a11\na22\na23\na24'.match(/a..$/g)
-	testcases[count++] = new TestCase ( SECTION, "(multiline == true) 'a11\\na22\\na23\\na24'.match(/a..$/g)",
-	                                    String(['a11','a22','a23','a24']), String('a11\na22\na23\na24'.match(/a..$/g)));
+    testcases[count++] = new TestCase ( SECTION, "(multiline == true) 'a11\\na22\\na23\\na24'.match(/a..$/gm)",
+                                        String(['a11','a22','a23','a24']), String('a11\na22\na23\na24'.match(/a..$/gm)));
 
     // (multiline == true) 'a11\na22\na23\na24'.match(new RegExp('a..$','g'))
-	testcases[count++] = new TestCase ( SECTION, "(multiline == true) 'a11\\na22\\na23\\na24'.match(new RegExp('a..$','g'))",
-	                                    String(['a11','a22','a23','a24']), String('a11\na22\na23\na24'.match(new RegExp('a..$','g'))));
+    testcases[count++] = new TestCase ( SECTION, "(multiline == true) 'a11\\na22\\na23\\na24'.match(new RegExp('a..$','gm'))",
+                                        String(['a11','a22','a23','a24']), String('a11\na22\na23\na24'.match(new RegExp('a..$','gm'))));
 
     // (multiline == true) 'abc\ndef'.match(/c$....$/)
 	//testcases[count++] = new TestCase ( SECTION, "(multiline == true) 'abc\ndef'.match(/c$.+$/)",

Modified: trunk/Source/_javascript_Core/tests/mozilla/js1_2/regexp/RegExp_multiline_as_array.js (110539 => 110540)


--- trunk/Source/_javascript_Core/tests/mozilla/js1_2/regexp/RegExp_multiline_as_array.js	2012-03-13 05:38:59 UTC (rev 110539)
+++ trunk/Source/_javascript_Core/tests/mozilla/js1_2/regexp/RegExp_multiline_as_array.js	2012-03-13 06:15:58 UTC (rev 110540)
@@ -83,28 +83,28 @@
 	                                    true, RegExp['$*']);
 
     // (['$*'] == true) '123\n456'.match(/^4../)
-	testcases[count++] = new TestCase ( SECTION, "(['$*'] == true) '123\\n456'.match(/^4../)",
-	                                    String(['456']), String('123\n456'.match(/^4../)));
+    testcases[count++] = new TestCase ( SECTION, "(['$*'] == true) '123\\n456'.match(/^4../m)",
+                                        String(['456']), String('123\n456'.match(/^4../m)));
 
     // (['$*'] == true) 'a11\na22\na23\na24'.match(/^a../g)
-	testcases[count++] = new TestCase ( SECTION, "(['$*'] == true) 'a11\\na22\\na23\\na24'.match(/^a../g)",
-	                                    String(['a11','a22','a23','a24']), String('a11\na22\na23\na24'.match(/^a../g)));
+    testcases[count++] = new TestCase ( SECTION, "(['$*'] == true) 'a11\\na22\\na23\\na24'.match(/^a../gm)",
+                                        String(['a11','a22','a23','a24']), String('a11\na22\na23\na24'.match(/^a../gm)));
 
     // (['$*'] == true) 'a11\na22'.match(/^.+^./)
 	//testcases[count++] = new TestCase ( SECTION, "(['$*'] == true) 'a11\na22'.match(/^.+^./)",
 	//                                    String(['a11\na']), String('a11\na22'.match(/^.+^./)));
 
     // (['$*'] == true) '123\n456'.match(/.3$/)
-	testcases[count++] = new TestCase ( SECTION, "(['$*'] == true) '123\\n456'.match(/.3$/)",
-	                                    String(['23']), String('123\n456'.match(/.3$/)));
+    testcases[count++] = new TestCase ( SECTION, "(['$*'] == true) '123\\n456'.match(/.3$/m)",
+                                        String(['23']), String('123\n456'.match(/.3$/m)));
 
     // (['$*'] == true) 'a11\na22\na23\na24'.match(/a..$/g)
-	testcases[count++] = new TestCase ( SECTION, "(['$*'] == true) 'a11\\na22\\na23\\na24'.match(/a..$/g)",
-	                                    String(['a11','a22','a23','a24']), String('a11\na22\na23\na24'.match(/a..$/g)));
+    testcases[count++] = new TestCase ( SECTION, "(['$*'] == true) 'a11\\na22\\na23\\na24'.match(/a..$/gm)",
+                                        String(['a11','a22','a23','a24']), String('a11\na22\na23\na24'.match(/a..$/gm)));
 
     // (['$*'] == true) 'a11\na22\na23\na24'.match(new RegExp('a..$','g'))
-	testcases[count++] = new TestCase ( SECTION, "(['$*'] == true) 'a11\\na22\\na23\\na24'.match(new RegExp('a..$','g'))",
-	                                    String(['a11','a22','a23','a24']), String('a11\na22\na23\na24'.match(new RegExp('a..$','g'))));
+    testcases[count++] = new TestCase ( SECTION, "(['$*'] == true) 'a11\\na22\\na23\\na24'.match(new RegExp('a..$','gm'))",
+                                        String(['a11','a22','a23','a24']), String('a11\na22\na23\na24'.match(new RegExp('a..$','gm'))));
 
     // (['$*'] == true) 'abc\ndef'.match(/c$....$/)
 	//testcases[count++] = new TestCase ( SECTION, "(['$*'] == true) 'abc\ndef'.match(/c$.+$/)",

Modified: trunk/Source/_javascript_Core/tests/mozilla/js1_2/regexp/beginLine.js (110539 => 110540)


--- trunk/Source/_javascript_Core/tests/mozilla/js1_2/regexp/beginLine.js	2012-03-13 05:38:59 UTC (rev 110539)
+++ trunk/Source/_javascript_Core/tests/mozilla/js1_2/regexp/beginLine.js	2012-03-13 06:15:58 UTC (rev 110540)
@@ -60,8 +60,8 @@
 
     RegExp.multiline = true;
     // 'abc\n123xyz'.match(new RegExp('^\d+')) <multiline==true>
-	testcases[count++] = new TestCase ( SECTION, "'abc\n123xyz'.match(new RegExp('^\\d+'))",
-	                                    String(['123']), String('abc\n123xyz'.match(new RegExp('^\\d+'))));
+    testcases[count++] = new TestCase ( SECTION, "'abc\n123xyz'.match(new RegExp('^\\d+','m'))",
+                                        String(['123']), String('abc\n123xyz'.match(new RegExp('^\\d+','m'))));
 
 	function test()
 	{

Modified: trunk/Source/_javascript_Core/tests/mozilla/js1_2/regexp/endLine.js (110539 => 110540)


--- trunk/Source/_javascript_Core/tests/mozilla/js1_2/regexp/endLine.js	2012-03-13 05:38:59 UTC (rev 110539)
+++ trunk/Source/_javascript_Core/tests/mozilla/js1_2/regexp/endLine.js	2012-03-13 06:15:58 UTC (rev 110540)
@@ -60,8 +60,8 @@
 
     RegExp.multiline = true;
     // 'abc\n123xyz890\nxyz'.match(new RegExp('\d+$')) <multiline==true>
-	testcases[count++] = new TestCase ( SECTION, "'abc\n123xyz890\nxyz'.match(new RegExp('\\d+$'))",
-	                                    String(['890']), String('abc\n123xyz890\nxyz'.match(new RegExp('\\d+$'))));
+    testcases[count++] = new TestCase ( SECTION, "'abc\n123xyz890\nxyz'.match(new RegExp('\\d+$','m'))",
+                                        String(['890']), String('abc\n123xyz890\nxyz'.match(new RegExp('\\d+$','m'))));
 
 	function test()
 	{

_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to