summaryrefslogtreecommitdiff
path: root/deps/v8/src/array.js
diff options
context:
space:
mode:
Diffstat (limited to 'deps/v8/src/array.js')
-rw-r--r--deps/v8/src/array.js13
1 files changed, 6 insertions, 7 deletions
diff --git a/deps/v8/src/array.js b/deps/v8/src/array.js
index a805157b13..c5ff505c1d 100644
--- a/deps/v8/src/array.js
+++ b/deps/v8/src/array.js
@@ -159,11 +159,9 @@ function Join(array, length, separator, convert) {
}
-function ConvertToString(x) {
- if (IS_STRING(x)) return x;
- if (IS_NUMBER(x)) return %_NumberToString(x);
- if (IS_BOOLEAN(x)) return x ? 'true' : 'false';
- return (IS_NULL_OR_UNDEFINED(x)) ? '' : %ToString(%DefaultString(x));
+function ConvertToString(e) {
+ if (e == null) return '';
+ else return ToString(e);
}
@@ -367,13 +365,14 @@ function ArrayJoin(separator) {
if (IS_UNDEFINED(separator)) {
separator = ',';
} else if (!IS_STRING(separator)) {
- separator = NonStringToString(separator);
+ separator = ToString(separator);
}
var result = %_FastAsciiArrayJoin(this, separator);
if (!IS_UNDEFINED(result)) return result;
- return Join(this, TO_UINT32(this.length), separator, ConvertToString);
+ var length = TO_UINT32(this.length);
+ return Join(this, length, separator, ConvertToString);
}