From cd7d61cfc2252a909b21e358e9240fc560b4ccad Mon Sep 17 00:00:00 2001 From: "yangguo@chromium.org" Date: Mon, 23 Dec 2013 10:01:22 +0000 Subject: [PATCH] Fix small spec violation in String.prototype.split. Also slightly extended the test coverage. R=rossberg@chromium.org BUG=v8:3026 LOG=Y Review URL: https://codereview.chromium.org/119093002 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@18405 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/string.js | 16 +++++++--------- test/mjsunit/regress/regress-3026.js | 28 ++++++++++++++++++++++++++++ test/mjsunit/string-split.js | 19 +++++++++++++++++++ 3 files changed, 54 insertions(+), 9 deletions(-) create mode 100644 test/mjsunit/regress/regress-3026.js diff --git a/src/string.js b/src/string.js index 14b44ca..dd5115d 100644 --- a/src/string.js +++ b/src/string.js @@ -616,24 +616,22 @@ function StringSplit(separator, limit) { var subject = TO_STRING_INLINE(this); limit = (IS_UNDEFINED(limit)) ? 0xffffffff : TO_UINT32(limit); - // ECMA-262 says that if separator is undefined, the result should - // be an array of size 1 containing the entire string. - if (IS_UNDEFINED(separator)) { - return [subject]; - } - var length = subject.length; if (!IS_REGEXP(separator)) { - separator = TO_STRING_INLINE(separator); + var separator_string = TO_STRING_INLINE(separator); if (limit === 0) return []; - var separator_length = separator.length; + // ECMA-262 says that if separator is undefined, the result should + // be an array of size 1 containing the entire string. + if (IS_UNDEFINED(separator)) return [subject]; + + var separator_length = separator_string.length; // If the separator string is empty then return the elements in the subject. if (separator_length === 0) return %StringToArray(subject, limit); - var result = %StringSplit(subject, separator, limit); + var result = %StringSplit(subject, separator_string, limit); return result; } diff --git a/test/mjsunit/regress/regress-3026.js b/test/mjsunit/regress/regress-3026.js new file mode 100644 index 0000000..d25c88d --- /dev/null +++ b/test/mjsunit/regress/regress-3026.js @@ -0,0 +1,28 @@ +// Copyright 2013 the V8 project authors. All rights reserved. +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following +// disclaimer in the documentation and/or other materials provided +// with the distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived +// from this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +assertEquals([], "abc".split(undefined, 0)); diff --git a/test/mjsunit/string-split.js b/test/mjsunit/string-split.js index 1308244..efd0ef3 100644 --- a/test/mjsunit/string-split.js +++ b/test/mjsunit/string-split.js @@ -145,3 +145,22 @@ for (var i = 0; i < 128; i++) { assertEquals(1, split_chars[i].length); assertEquals(i, split_chars[i].charCodeAt(0)); } + +// Check that the separator is converted to string before returning due to +// limit == 0. +var counter = 0; +var separator = { toString: function() { counter++; return "b"; }}; +assertEquals([], "abc".split(separator, 0)); +assertEquals(1, counter); + +// Check that the subject is converted to string before the separator. +counter = 0; +var subject = { toString: function() { assertEquals(0, counter); + counter++; + return "abc"; }}; +separator = { toString: function() { assertEquals(1, counter); + counter++; + return "b"; }}; + +assertEquals(["a", "c"], String.prototype.split.call(subject, separator)); +assertEquals(2, counter); -- 2.7.4