From 6b1ed8fd6123fdde4cddd2cbc2086f19db32b793 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Wed, 17 Feb 2016 19:32:43 +0300 Subject: [PATCH] JS: use slice() instead of slice(0) to copy arrays (minor). --- js/js.libraries/src/core/kotlin.kt | 18 +++++++++++++++++- js/js.libraries/src/core/kotlin_special.kt | 18 +++++++++--------- .../src/templates/SpecialJS.kt | 2 +- 3 files changed, 27 insertions(+), 11 deletions(-) diff --git a/js/js.libraries/src/core/kotlin.kt b/js/js.libraries/src/core/kotlin.kt index f06847cd98c..947b10f99ab 100644 --- a/js/js.libraries/src/core/kotlin.kt +++ b/js/js.libraries/src/core/kotlin.kt @@ -1,3 +1,19 @@ +/* + * Copyright 2010-2016 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package kotlin import java.util.* @@ -68,7 +84,7 @@ internal fun arrayCopyResize(source: dynamic, newSize: Int, defaultValue: Any?): } internal fun arrayPlusCollection(array: dynamic, collection: Collection): dynamic { - val result = array.slice(0) + val result = array.slice() result.length += collection.size var index: Int = array.length for (element in collection) result[index++] = element diff --git a/js/js.libraries/src/core/kotlin_special.kt b/js/js.libraries/src/core/kotlin_special.kt index 4f474d7e9ca..9ed756d76f9 100644 --- a/js/js.libraries/src/core/kotlin_special.kt +++ b/js/js.libraries/src/core/kotlin_special.kt @@ -79,7 +79,7 @@ public inline fun ShortArray.asList(): List { */ @Suppress("NOTHING_TO_INLINE") public inline fun Array.copyOf(): Array { - return this.asDynamic().slice(0) + return this.asDynamic().slice() } /** @@ -87,7 +87,7 @@ public inline fun Array.copyOf(): Array { */ @Suppress("NOTHING_TO_INLINE") public inline fun BooleanArray.copyOf(): BooleanArray { - return this.asDynamic().slice(0) + return this.asDynamic().slice() } /** @@ -95,7 +95,7 @@ public inline fun BooleanArray.copyOf(): BooleanArray { */ @Suppress("NOTHING_TO_INLINE") public inline fun ByteArray.copyOf(): ByteArray { - return this.asDynamic().slice(0) + return this.asDynamic().slice() } /** @@ -103,7 +103,7 @@ public inline fun ByteArray.copyOf(): ByteArray { */ @Suppress("NOTHING_TO_INLINE") public inline fun CharArray.copyOf(): CharArray { - return this.asDynamic().slice(0) + return this.asDynamic().slice() } /** @@ -111,7 +111,7 @@ public inline fun CharArray.copyOf(): CharArray { */ @Suppress("NOTHING_TO_INLINE") public inline fun DoubleArray.copyOf(): DoubleArray { - return this.asDynamic().slice(0) + return this.asDynamic().slice() } /** @@ -119,7 +119,7 @@ public inline fun DoubleArray.copyOf(): DoubleArray { */ @Suppress("NOTHING_TO_INLINE") public inline fun FloatArray.copyOf(): FloatArray { - return this.asDynamic().slice(0) + return this.asDynamic().slice() } /** @@ -127,7 +127,7 @@ public inline fun FloatArray.copyOf(): FloatArray { */ @Suppress("NOTHING_TO_INLINE") public inline fun IntArray.copyOf(): IntArray { - return this.asDynamic().slice(0) + return this.asDynamic().slice() } /** @@ -135,7 +135,7 @@ public inline fun IntArray.copyOf(): IntArray { */ @Suppress("NOTHING_TO_INLINE") public inline fun LongArray.copyOf(): LongArray { - return this.asDynamic().slice(0) + return this.asDynamic().slice() } /** @@ -143,7 +143,7 @@ public inline fun LongArray.copyOf(): LongArray { */ @Suppress("NOTHING_TO_INLINE") public inline fun ShortArray.copyOf(): ShortArray { - return this.asDynamic().slice(0) + return this.asDynamic().slice() } /** diff --git a/libraries/tools/kotlin-stdlib-gen/src/templates/SpecialJS.kt b/libraries/tools/kotlin-stdlib-gen/src/templates/SpecialJS.kt index 11247bfe441..4eb0bb2aa2f 100644 --- a/libraries/tools/kotlin-stdlib-gen/src/templates/SpecialJS.kt +++ b/libraries/tools/kotlin-stdlib-gen/src/templates/SpecialJS.kt @@ -58,7 +58,7 @@ fun specialJS(): List { returns("SELF") returns(ArraysOfObjects) { "Array" } body { - "return this.asDynamic().slice(0)" + "return this.asDynamic().slice()" } }