Revision: 5766
Author: [email protected]
Date: Thu Nov 4 03:24:17 2010
Log: Fix issue 924 - splitting the empty string.
Review URL: http://codereview.chromium.org/4483001
http://code.google.com/p/v8/source/detail?r=5766
Modified:
/branches/bleeding_edge/src/string.js
/branches/bleeding_edge/test/mjsunit/string-split.js
=======================================
--- /branches/bleeding_edge/src/string.js Tue Nov 2 06:37:59 2010
+++ /branches/bleeding_edge/src/string.js Thu Nov 4 03:24:17 2010
@@ -567,7 +567,7 @@
%_Log('regexp', 'regexp-split,%0S,%1r', [subject, separator]);
if (length === 0) {
- if (splitMatch(separator, subject, 0, 0) != null) {
+ if (DoRegExpExec(separator, subject, 0, 0) != null) {
return [];
}
return [subject];
=======================================
--- /branches/bleeding_edge/test/mjsunit/string-split.js Tue Sep 9
13:08:45 2008
+++ /branches/bleeding_edge/test/mjsunit/string-split.js Thu Nov 4
03:24:17 2010
@@ -27,76 +27,45 @@
expected = ["A", undefined, "B", "bold", "/", "B", "and",
undefined, "CODE", "coded", "/", "CODE", ""];
result = "A<B>bold</B>and<CODE>coded</CODE>".split(/<(\/)?([^<>]+)>/);
-assertArrayEquals(expected, result, 1);
-
-expected = ["a", "b"];
-result = "ab".split(/a*?/);
-assertArrayEquals(expected, result, 2);
-
-expected = ["", "b"];
-result = "ab".split(/a*/);
-assertArrayEquals(expected, result, 3);
-
-expected = ["a"];
-result = "ab".split(/a*?/, 1);
-assertArrayEquals(expected, result, 4);
-
-expected = [""];
-result = "ab".split(/a*/, 1);
-assertArrayEquals(expected, result, 5);
-
-expected = ["as","fas","fas","f"];
-result = "asdfasdfasdf".split("d");
-assertArrayEquals(expected, result, 6);
-
-expected = ["as","fas","fas","f"];
-result = "asdfasdfasdf".split("d", -1);
-assertArrayEquals(expected, result, 7);
-
-expected = ["as", "fas"];
-result = "asdfasdfasdf".split("d", 2);
-assertArrayEquals(expected, result, 8);
-
-expected = [];
-result = "asdfasdfasdf".split("d", 0);
-assertArrayEquals(expected, result, 9);
-
-expected = ["as","fas","fas",""];
-result = "asdfasdfasd".split("d");
-assertArrayEquals(expected, result, 10);
-
-expected = [];
-result = "".split("");
-assertArrayEquals(expected, result, 11);
-
-expected = [""]
-result = "".split("a");
-assertArrayEquals(expected, result, 12);
-
-expected = ["a","b"]
-result = "axxb".split(/x*/);
-assertArrayEquals(expected, result, 13);
-
-expected = ["a","b"]
-result = "axxb".split(/x+/);
-assertArrayEquals(expected, result, 14);
-
-expected = ["a","","b"]
-result = "axxb".split(/x/);
-assertArrayEquals(expected, result, 15);
+assertArrayEquals(expected, result);
+
+
+assertArrayEquals(["a", "b"], "ab".split(/a*?/));
+
+assertArrayEquals(["", "b"], "ab".split(/a*/));
+
+assertArrayEquals(["a"], "ab".split(/a*?/, 1));
+
+assertArrayEquals([""], "ab".split(/a*/, 1));
+
+assertArrayEquals(["as","fas","fas","f"], "asdfasdfasdf".split("d"));
+
+assertArrayEquals(["as","fas","fas","f"], "asdfasdfasdf".split("d", -1));
+
+assertArrayEquals(["as", "fas"], "asdfasdfasdf".split("d", 2));
+
+assertArrayEquals([], "asdfasdfasdf".split("d", 0));
+
+assertArrayEquals(["as","fas","fas",""], "asdfasdfasd".split("d"));
+
+assertArrayEquals([], "".split(""));
+
+assertArrayEquals([""], "".split("a"));
+
+assertArrayEquals(["a","b"], "axxb".split(/x*/));
+
+assertArrayEquals(["a","b"], "axxb".split(/x+/));
+
+assertArrayEquals(["a","","b"], "axxb".split(/x/));
// This was http://b/issue?id=1151354
-expected = ["div", "#id", ".class"]
-result = "div#id.class".split(/(?=[#.])/);
-assertArrayEquals(expected, result, 16);
-
-expected = ["div", "#i", "d", ".class"]
-result = "div#id.class".split(/(?=[d#.])/);
-assertArrayEquals(expected, result, 17);
-
-expected = ["a", "b", "c"]
-result = "abc".split(/(?=.)/);
-assertArrayEquals(expected, result, 18);
+assertArrayEquals(["div", "#id", ".class"], "div#id.class".split(/(?=[#.])/));
+
+
+assertArrayEquals(["div", "#i", "d", ".class"],
"div#id.class".split(/(?=[d#.])/));
+
+assertArrayEquals(["a", "b", "c"], "abc".split(/(?=.)/));
+
/* "ab".split(/((?=.))/)
*
@@ -108,19 +77,23 @@
*
* Opera seems to have this right. The others make no sense.
*/
-expected = ["a", "", "b"]
-result = "ab".split(/((?=.))/);
-assertArrayEquals(expected, result, 19);
+assertArrayEquals(["a", "", "b"], "ab".split(/((?=.))/));
/* "ab".split(/(?=)/)
*
* KJS: a,b
* SM: ab
* IE: a,b
- * Opera: a,b
+ * Opera: a,bb
* V8: a,b
*/
-expected = ["a", "b"]
-result = "ab".split(/(?=)/);
-assertArrayEquals(expected, result, 20);
-
+assertArrayEquals(["a", "b"], "ab".split(/(?=)/));
+
+
+// For issue http://code.google.com/p/v8/issues/detail?id=924
+// Splitting the empty string is a special case.
+assertEquals([""], ''.split());
+assertEquals([""], ''.split(/./));
+assertEquals([], ''.split(/.?/));
+assertEquals([], ''.split(/.??/));
+assertEquals([], ''.split(/()()/));
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
