| Index: src/array.js
|
| diff --git a/src/array.js b/src/array.js
|
| index 0f1e969f9871f2e7bee7b0f21e0d743facd8ac94..56f52549e6f2988c50dc8eb9345fb96894e92023 100644
|
| --- a/src/array.js
|
| +++ b/src/array.js
|
| @@ -121,37 +121,49 @@ function Join(array, length, separator, convert) {
|
| if (IS_STRING(e)) return e;
|
| return convert(e);
|
| }
|
| + return '';
|
| }
|
|
|
| // Construct an array for the elements.
|
| - var elements;
|
| + var elements = new $Array(length);
|
| var elements_length = 0;
|
|
|
| // We pull the empty separator check outside the loop for speed!
|
| if (separator.length == 0) {
|
| - elements = new $Array(length);
|
| for (var i = 0; i < length; i++) {
|
| var e = array[i];
|
| - if (!IS_UNDEFINED(e) || (i in array)) {
|
| + if (!IS_UNDEFINED(e)) {
|
| if (!IS_STRING(e)) e = convert(e);
|
| elements[elements_length++] = e;
|
| }
|
| }
|
| - } else {
|
| - elements = new $Array(length << 1);
|
| - for (var i = 0; i < length; i++) {
|
| - var e = array[i];
|
| - if (i != 0) elements[elements_length++] = separator;
|
| - if (!IS_UNDEFINED(e) || (i in array)) {
|
| - if (!IS_STRING(e)) e = convert(e);
|
| - elements[elements_length++] = e;
|
| - }
|
| + elements.length = elements_length;
|
| + var result = %_FastAsciiArrayJoin(elements, '');
|
| + if (!IS_UNDEFINED(result)) return result;
|
| + return %StringBuilderConcat(elements, elements_length, '');
|
| + }
|
| + // Non-empty separator.
|
| + for (var i = 0; i < length; i++) {
|
| + var e = array[i];
|
| + if (!IS_UNDEFINED(e)) {
|
| + if (!IS_STRING(e)) e = convert(e);
|
| + elements[i] = e;
|
| + } else {
|
| + elements[i] = '';
|
| }
|
| }
|
| - elements.length = elements_length;
|
| - var result = %_FastAsciiArrayJoin(elements, "");
|
| - if (!IS_UNDEFINED(result)) return result;
|
| - return %StringBuilderConcat(elements, elements_length, '');
|
| + var result = %_FastAsciiArrayJoin(elements, separator);
|
| + if (!IS_UNDEFINED(result)) return result;
|
| +
|
| + var length2 = (length << 1) - 1;
|
| + var j = length2;
|
| + var i = length;
|
| + elements[--j] = elements[--i];
|
| + while (i > 0) {
|
| + elements[--j] = separator;
|
| + elements[--j] = elements[--i];
|
| + }
|
| + return %StringBuilderConcat(elements, length2, '');
|
| } finally {
|
| // Make sure to pop the visited array no matter what happens.
|
| if (is_array) visited_arrays.pop();
|
| @@ -160,7 +172,7 @@ function Join(array, length, separator, convert) {
|
|
|
|
|
| function ConvertToString(x) {
|
| - if (IS_STRING(x)) return x;
|
| + // Assumes x is a non-string.
|
| if (IS_NUMBER(x)) return %_NumberToString(x);
|
| if (IS_BOOLEAN(x)) return x ? 'true' : 'false';
|
| return (IS_NULL_OR_UNDEFINED(x)) ? '' : %ToString(%DefaultString(x));
|
|
|