azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implement asList, slice & sliceArray extension functions for UArrays

Browse Source
This commit is contained in:
Abduqodiri Qurbonzoda
2019-01-24 16:55:57 +03:00
committed by Ilya Gorbunov
parent 114736c09b
commit fc85781bfc
16 changed files with 646 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
generators/builtins/unsignedTypes.kt
+1 -2
View File
@@ -454,8 +454,7 @@ class UnsignedArrayGenerator(val type: UnsignedType, out: PrintWriter) : BuiltIn
}
override fun containsAll(elements: Collection<$elementType>): Boolean {
if ((elements as Collection<Any?>).any { it as? $elementType == null }) return false
return elements.all { storage.contains(it.to$storageElementType()) }
return (elements as Collection<*>).all { it is $elementType && storage.contains(it.to$storageElementType()) }
}
override fun isEmpty(): Boolean = this.storage.size == 0"""
libraries/stdlib/common/src/generated/_Arrays.kt
+9 -9
View File
@@ -4040,7 +4040,7 @@ public fun CharArray.sliceArray(indices: Collection<Int>): CharArray {
}
/**
* Returns a list containing elements at indices in the specified [indices] range.
* Returns an array containing elements at indices in the specified [indices] range.
*/
public fun <T> Array<T>.sliceArray(indices: IntRange): Array<T> {
if (indices.isEmpty()) return copyOfRange(0, 0)
@@ -4048,7 +4048,7 @@ public fun <T> Array<T>.sliceArray(indices: IntRange): Array<T> {
}
/**
* Returns a list containing elements at indices in the specified [indices] range.
* Returns an array containing elements at indices in the specified [indices] range.
*/
public fun ByteArray.sliceArray(indices: IntRange): ByteArray {
if (indices.isEmpty()) return ByteArray(0)
@@ -4056,7 +4056,7 @@ public fun ByteArray.sliceArray(indices: IntRange): ByteArray {
}
/**
* Returns a list containing elements at indices in the specified [indices] range.
* Returns an array containing elements at indices in the specified [indices] range.
*/
public fun ShortArray.sliceArray(indices: IntRange): ShortArray {
if (indices.isEmpty()) return ShortArray(0)
@@ -4064,7 +4064,7 @@ public fun ShortArray.sliceArray(indices: IntRange): ShortArray {
}
/**
* Returns a list containing elements at indices in the specified [indices] range.
* Returns an array containing elements at indices in the specified [indices] range.
*/
public fun IntArray.sliceArray(indices: IntRange): IntArray {
if (indices.isEmpty()) return IntArray(0)
@@ -4072,7 +4072,7 @@ public fun IntArray.sliceArray(indices: IntRange): IntArray {
}
/**
* Returns a list containing elements at indices in the specified [indices] range.
* Returns an array containing elements at indices in the specified [indices] range.
*/
public fun LongArray.sliceArray(indices: IntRange): LongArray {
if (indices.isEmpty()) return LongArray(0)
@@ -4080,7 +4080,7 @@ public fun LongArray.sliceArray(indices: IntRange): LongArray {
}
/**
* Returns a list containing elements at indices in the specified [indices] range.
* Returns an array containing elements at indices in the specified [indices] range.
*/
public fun FloatArray.sliceArray(indices: IntRange): FloatArray {
if (indices.isEmpty()) return FloatArray(0)
@@ -4088,7 +4088,7 @@ public fun FloatArray.sliceArray(indices: IntRange): FloatArray {
}
/**
* Returns a list containing elements at indices in the specified [indices] range.
* Returns an array containing elements at indices in the specified [indices] range.
*/
public fun DoubleArray.sliceArray(indices: IntRange): DoubleArray {
if (indices.isEmpty()) return DoubleArray(0)
@@ -4096,7 +4096,7 @@ public fun DoubleArray.sliceArray(indices: IntRange): DoubleArray {
}
/**
* Returns a list containing elements at indices in the specified [indices] range.
* Returns an array containing elements at indices in the specified [indices] range.
*/
public fun BooleanArray.sliceArray(indices: IntRange): BooleanArray {
if (indices.isEmpty()) return BooleanArray(0)
@@ -4104,7 +4104,7 @@ public fun BooleanArray.sliceArray(indices: IntRange): BooleanArray {
}
/**
* Returns a list containing elements at indices in the specified [indices] range.
* Returns an array containing elements at indices in the specified [indices] range.
*/
public fun CharArray.sliceArray(indices: IntRange): CharArray {
if (indices.isEmpty()) return CharArray(0)
libraries/stdlib/common/src/generated/_UArrays.kt
+200
View File
@@ -1383,6 +1383,178 @@ public inline fun UShortArray.singleOrNull(predicate: (UShort) -> Boolean): USho
return single
}
/**
* Returns a list containing elements at indices in the specified [indices] range.
*/
@SinceKotlin("1.3")
@ExperimentalUnsignedTypes
public fun UIntArray.slice(indices: IntRange): List<UInt> {
if (indices.isEmpty()) return listOf()
return copyOfRange(indices.start, indices.endInclusive + 1).asList()
}
/**
* Returns a list containing elements at indices in the specified [indices] range.
*/
@SinceKotlin("1.3")
@ExperimentalUnsignedTypes
public fun ULongArray.slice(indices: IntRange): List<ULong> {
if (indices.isEmpty()) return listOf()
return copyOfRange(indices.start, indices.endInclusive + 1).asList()
}
/**
* Returns a list containing elements at indices in the specified [indices] range.
*/
@SinceKotlin("1.3")
@ExperimentalUnsignedTypes
public fun UByteArray.slice(indices: IntRange): List<UByte> {
if (indices.isEmpty()) return listOf()
return copyOfRange(indices.start, indices.endInclusive + 1).asList()
}
/**
* Returns a list containing elements at indices in the specified [indices] range.
*/
@SinceKotlin("1.3")
@ExperimentalUnsignedTypes
public fun UShortArray.slice(indices: IntRange): List<UShort> {
if (indices.isEmpty()) return listOf()
return copyOfRange(indices.start, indices.endInclusive + 1).asList()
}
/**
* Returns a list containing elements at specified [indices].
*/
@SinceKotlin("1.3")
@ExperimentalUnsignedTypes
public fun UIntArray.slice(indices: Iterable<Int>): List<UInt> {
val size = indices.collectionSizeOrDefault(10)
if (size == 0) return emptyList()
val list = ArrayList<UInt>(size)
for (index in indices) {
list.add(get(index))
}
return list
}
/**
* Returns a list containing elements at specified [indices].
*/
@SinceKotlin("1.3")
@ExperimentalUnsignedTypes
public fun ULongArray.slice(indices: Iterable<Int>): List<ULong> {
val size = indices.collectionSizeOrDefault(10)
if (size == 0) return emptyList()
val list = ArrayList<ULong>(size)
for (index in indices) {
list.add(get(index))
}
return list
}
/**
* Returns a list containing elements at specified [indices].
*/
@SinceKotlin("1.3")
@ExperimentalUnsignedTypes
public fun UByteArray.slice(indices: Iterable<Int>): List<UByte> {
val size = indices.collectionSizeOrDefault(10)
if (size == 0) return emptyList()
val list = ArrayList<UByte>(size)
for (index in indices) {
list.add(get(index))
}
return list
}
/**
* Returns a list containing elements at specified [indices].
*/
@SinceKotlin("1.3")
@ExperimentalUnsignedTypes
public fun UShortArray.slice(indices: Iterable<Int>): List<UShort> {
val size = indices.collectionSizeOrDefault(10)
if (size == 0) return emptyList()
val list = ArrayList<UShort>(size)
for (index in indices) {
list.add(get(index))
}
return list
}
/**
* Returns an array containing elements of this array at specified [indices].
*/
@SinceKotlin("1.3")
@ExperimentalUnsignedTypes
public fun UIntArray.sliceArray(indices: Collection<Int>): UIntArray {
return UIntArray(storage.sliceArray(indices))
}
/**
* Returns an array containing elements of this array at specified [indices].
*/
@SinceKotlin("1.3")
@ExperimentalUnsignedTypes
public fun ULongArray.sliceArray(indices: Collection<Int>): ULongArray {
return ULongArray(storage.sliceArray(indices))
}
/**
* Returns an array containing elements of this array at specified [indices].
*/
@SinceKotlin("1.3")
@ExperimentalUnsignedTypes
public fun UByteArray.sliceArray(indices: Collection<Int>): UByteArray {
return UByteArray(storage.sliceArray(indices))
}
/**
* Returns an array containing elements of this array at specified [indices].
*/
@SinceKotlin("1.3")
@ExperimentalUnsignedTypes
public fun UShortArray.sliceArray(indices: Collection<Int>): UShortArray {
return UShortArray(storage.sliceArray(indices))
}
/**
* Returns an array containing elements at indices in the specified [indices] range.
*/
@SinceKotlin("1.3")
@ExperimentalUnsignedTypes
public fun UIntArray.sliceArray(indices: IntRange): UIntArray {
return UIntArray(storage.sliceArray(indices))
}
/**
* Returns an array containing elements at indices in the specified [indices] range.
*/
@SinceKotlin("1.3")
@ExperimentalUnsignedTypes
public fun ULongArray.sliceArray(indices: IntRange): ULongArray {
return ULongArray(storage.sliceArray(indices))
}
/**
* Returns an array containing elements at indices in the specified [indices] range.
*/
@SinceKotlin("1.3")
@ExperimentalUnsignedTypes
public fun UByteArray.sliceArray(indices: IntRange): UByteArray {
return UByteArray(storage.sliceArray(indices))
}
/**
* Returns an array containing elements at indices in the specified [indices] range.
*/
@SinceKotlin("1.3")
@ExperimentalUnsignedTypes
public fun UShortArray.sliceArray(indices: IntRange): UShortArray {
return UShortArray(storage.sliceArray(indices))
}
/**
* Reverses elements in the array in-place.
*/
@@ -1533,6 +1705,34 @@ public inline fun UIntArray.asIntArray(): IntArray {
return storage
}
/**
* Returns a [List] that wraps the original array.
*/
@SinceKotlin("1.3")
@ExperimentalUnsignedTypes
public expect fun UIntArray.asList(): List<UInt>
/**
* Returns a [List] that wraps the original array.
*/
@SinceKotlin("1.3")
@ExperimentalUnsignedTypes
public expect fun ULongArray.asList(): List<ULong>
/**
* Returns a [List] that wraps the original array.
*/
@SinceKotlin("1.3")
@ExperimentalUnsignedTypes
public expect fun UByteArray.asList(): List<UByte>
/**
* Returns a [List] that wraps the original array.
*/
@SinceKotlin("1.3")
@ExperimentalUnsignedTypes
public expect fun UShortArray.asList(): List<UShort>
/**
* Returns an array of type [LongArray], which is a view of this array where each element is a signed reinterpretation
* of the corresponding element of this array.
libraries/stdlib/js/irRuntime/generated/_ArraysJs.kt
+12 -3
View File
@@ -85,9 +85,18 @@ public actual fun CharArray.asList(): List<Char> {
override val size: Int get() = this@asList.size
override fun isEmpty(): Boolean = this@asList.isEmpty()
override fun contains(element: Char): Boolean = this@asList.contains(element)
override fun get(index: Int): Char = this@asList[index]
override fun indexOf(element: Char): Int = this@asList.indexOf(element)
override fun lastIndexOf(element: Char): Int = this@asList.lastIndexOf(element)
override fun get(index: Int): Char {
AbstractList.checkElementIndex(index, size)
return this@asList[index]
}
override fun indexOf(element: Char): Int {
if ((element as Any?) !is Char) return -1
return this@asList.indexOf(element)
}
override fun lastIndexOf(element: Char): Int {
if ((element as Any?) !is Char) return -1
return this@asList.lastIndexOf(element)
}
}
}
libraries/stdlib/js/irRuntime/generated/_UArraysJs.kt
+114
View File
@@ -0,0 +1,114 @@
/*
* Copyright 2010-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
* that can be found in the license/LICENSE.txt file.
*/
package kotlin.collections
//
// NOTE: THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt
// See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
//
import kotlin.js.*
/**
* Returns a [List] that wraps the original array.
*/
@SinceKotlin("1.3")
@ExperimentalUnsignedTypes
public actual fun UIntArray.asList(): List<UInt> {
return object : AbstractList<UInt>(), RandomAccess {
override val size: Int get() = this@asList.size
override fun isEmpty(): Boolean = this@asList.isEmpty()
override fun contains(element: UInt): Boolean = this@asList.contains(element)
override fun get(index: Int): UInt {
AbstractList.checkElementIndex(index, size)
return this@asList[index]
}
override fun indexOf(element: UInt): Int {
if ((element as Any?) !is UInt) return -1
return this@asList.indexOf(element)
}
override fun lastIndexOf(element: UInt): Int {
if ((element as Any?) !is UInt) return -1
return this@asList.lastIndexOf(element)
}
}
}
/**
* Returns a [List] that wraps the original array.
*/
@SinceKotlin("1.3")
@ExperimentalUnsignedTypes
public actual fun ULongArray.asList(): List<ULong> {
return object : AbstractList<ULong>(), RandomAccess {
override val size: Int get() = this@asList.size
override fun isEmpty(): Boolean = this@asList.isEmpty()
override fun contains(element: ULong): Boolean = this@asList.contains(element)
override fun get(index: Int): ULong {
AbstractList.checkElementIndex(index, size)
return this@asList[index]
}
override fun indexOf(element: ULong): Int {
if ((element as Any?) !is ULong) return -1
return this@asList.indexOf(element)
}
override fun lastIndexOf(element: ULong): Int {
if ((element as Any?) !is ULong) return -1
return this@asList.lastIndexOf(element)
}
}
}
/**
* Returns a [List] that wraps the original array.
*/
@SinceKotlin("1.3")
@ExperimentalUnsignedTypes
public actual fun UByteArray.asList(): List<UByte> {
return object : AbstractList<UByte>(), RandomAccess {
override val size: Int get() = this@asList.size
override fun isEmpty(): Boolean = this@asList.isEmpty()
override fun contains(element: UByte): Boolean = this@asList.contains(element)
override fun get(index: Int): UByte {
AbstractList.checkElementIndex(index, size)
return this@asList[index]
}
override fun indexOf(element: UByte): Int {
if ((element as Any?) !is UByte) return -1
return this@asList.indexOf(element)
}
override fun lastIndexOf(element: UByte): Int {
if ((element as Any?) !is UByte) return -1
return this@asList.lastIndexOf(element)
}
}
}
/**
* Returns a [List] that wraps the original array.
*/
@SinceKotlin("1.3")
@ExperimentalUnsignedTypes
public actual fun UShortArray.asList(): List<UShort> {
return object : AbstractList<UShort>(), RandomAccess {
override val size: Int get() = this@asList.size
override fun isEmpty(): Boolean = this@asList.isEmpty()
override fun contains(element: UShort): Boolean = this@asList.contains(element)
override fun get(index: Int): UShort {
AbstractList.checkElementIndex(index, size)
return this@asList[index]
}
override fun indexOf(element: UShort): Int {
if ((element as Any?) !is UShort) return -1
return this@asList.indexOf(element)
}
override fun lastIndexOf(element: UShort): Int {
if ((element as Any?) !is UShort) return -1
return this@asList.lastIndexOf(element)
}
}
}
libraries/stdlib/js/src/generated/_ArraysJs.kt
+12 -3
View File
@@ -85,9 +85,18 @@ public actual fun CharArray.asList(): List<Char> {
override val size: Int get() = this@asList.size
override fun isEmpty(): Boolean = this@asList.isEmpty()
override fun contains(element: Char): Boolean = this@asList.contains(element)
override fun get(index: Int): Char = this@asList[index]
override fun indexOf(element: Char): Int = this@asList.indexOf(element)
override fun lastIndexOf(element: Char): Int = this@asList.lastIndexOf(element)
override fun get(index: Int): Char {
AbstractList.checkElementIndex(index, size)
return this@asList[index]
}
override fun indexOf(element: Char): Int {
if ((element as Any?) !is Char) return -1
return this@asList.indexOf(element)
}
override fun lastIndexOf(element: Char): Int {
if ((element as Any?) !is Char) return -1
return this@asList.lastIndexOf(element)
}
}
}
libraries/stdlib/js/src/generated/_UArraysJs.kt
+114
View File
@@ -0,0 +1,114 @@
/*
* Copyright 2010-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
* that can be found in the license/LICENSE.txt file.
*/
package kotlin.collections
//
// NOTE: THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt
// See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
//
import kotlin.js.*
/**
* Returns a [List] that wraps the original array.
*/
@SinceKotlin("1.3")
@ExperimentalUnsignedTypes
public actual fun UIntArray.asList(): List<UInt> {
return object : AbstractList<UInt>(), RandomAccess {
override val size: Int get() = this@asList.size
override fun isEmpty(): Boolean = this@asList.isEmpty()
override fun contains(element: UInt): Boolean = this@asList.contains(element)
override fun get(index: Int): UInt {
AbstractList.checkElementIndex(index, size)
return this@asList[index]
}
override fun indexOf(element: UInt): Int {
if ((element as Any?) !is UInt) return -1
return this@asList.indexOf(element)
}
override fun lastIndexOf(element: UInt): Int {
if ((element as Any?) !is UInt) return -1
return this@asList.lastIndexOf(element)
}
}
}
/**
* Returns a [List] that wraps the original array.
*/
@SinceKotlin("1.3")
@ExperimentalUnsignedTypes
public actual fun ULongArray.asList(): List<ULong> {
return object : AbstractList<ULong>(), RandomAccess {
override val size: Int get() = this@asList.size
override fun isEmpty(): Boolean = this@asList.isEmpty()
override fun contains(element: ULong): Boolean = this@asList.contains(element)
override fun get(index: Int): ULong {
AbstractList.checkElementIndex(index, size)
return this@asList[index]
}
override fun indexOf(element: ULong): Int {
if ((element as Any?) !is ULong) return -1
return this@asList.indexOf(element)
}
override fun lastIndexOf(element: ULong): Int {
if ((element as Any?) !is ULong) return -1
return this@asList.lastIndexOf(element)
}
}
}
/**
* Returns a [List] that wraps the original array.
*/
@SinceKotlin("1.3")
@ExperimentalUnsignedTypes
public actual fun UByteArray.asList(): List<UByte> {
return object : AbstractList<UByte>(), RandomAccess {
override val size: Int get() = this@asList.size
override fun isEmpty(): Boolean = this@asList.isEmpty()
override fun contains(element: UByte): Boolean = this@asList.contains(element)
override fun get(index: Int): UByte {
AbstractList.checkElementIndex(index, size)
return this@asList[index]
}
override fun indexOf(element: UByte): Int {
if ((element as Any?) !is UByte) return -1
return this@asList.indexOf(element)
}
override fun lastIndexOf(element: UByte): Int {
if ((element as Any?) !is UByte) return -1
return this@asList.lastIndexOf(element)
}
}
}
/**
* Returns a [List] that wraps the original array.
*/
@SinceKotlin("1.3")
@ExperimentalUnsignedTypes
public actual fun UShortArray.asList(): List<UShort> {
return object : AbstractList<UShort>(), RandomAccess {
override val size: Int get() = this@asList.size
override fun isEmpty(): Boolean = this@asList.isEmpty()
override fun contains(element: UShort): Boolean = this@asList.contains(element)
override fun get(index: Int): UShort {
AbstractList.checkElementIndex(index, size)
return this@asList[index]
}
override fun indexOf(element: UShort): Int {
if ((element as Any?) !is UShort) return -1
return this@asList.indexOf(element)
}
override fun lastIndexOf(element: UShort): Int {
if ((element as Any?) !is UShort) return -1
return this@asList.lastIndexOf(element)
}
}
}
libraries/stdlib/jvm/src/generated/_UArraysJvm.kt
+64
View File
@@ -14,6 +14,70 @@ package kotlin.collections
//
/**
* Returns a [List] that wraps the original array.
*/
@SinceKotlin("1.3")
@ExperimentalUnsignedTypes
public actual fun UIntArray.asList(): List<UInt> {
return object : AbstractList<UInt>(), RandomAccess {
override val size: Int get() = this@asList.size
override fun isEmpty(): Boolean = this@asList.isEmpty()
override fun contains(element: UInt): Boolean = this@asList.contains(element)
override fun get(index: Int): UInt = this@asList[index]
override fun indexOf(element: UInt): Int = this@asList.indexOf(element)
override fun lastIndexOf(element: UInt): Int = this@asList.lastIndexOf(element)
}
}
/**
* Returns a [List] that wraps the original array.
*/
@SinceKotlin("1.3")
@ExperimentalUnsignedTypes
public actual fun ULongArray.asList(): List<ULong> {
return object : AbstractList<ULong>(), RandomAccess {
override val size: Int get() = this@asList.size
override fun isEmpty(): Boolean = this@asList.isEmpty()
override fun contains(element: ULong): Boolean = this@asList.contains(element)
override fun get(index: Int): ULong = this@asList[index]
override fun indexOf(element: ULong): Int = this@asList.indexOf(element)
override fun lastIndexOf(element: ULong): Int = this@asList.lastIndexOf(element)
}
}
/**
* Returns a [List] that wraps the original array.
*/
@SinceKotlin("1.3")
@ExperimentalUnsignedTypes
public actual fun UByteArray.asList(): List<UByte> {
return object : AbstractList<UByte>(), RandomAccess {
override val size: Int get() = this@asList.size
override fun isEmpty(): Boolean = this@asList.isEmpty()
override fun contains(element: UByte): Boolean = this@asList.contains(element)
override fun get(index: Int): UByte = this@asList[index]
override fun indexOf(element: UByte): Int = this@asList.indexOf(element)
override fun lastIndexOf(element: UByte): Int = this@asList.lastIndexOf(element)
}
}
/**
* Returns a [List] that wraps the original array.
*/
@SinceKotlin("1.3")
@ExperimentalUnsignedTypes
public actual fun UShortArray.asList(): List<UShort> {
return object : AbstractList<UShort>(), RandomAccess {
override val size: Int get() = this@asList.size
override fun isEmpty(): Boolean = this@asList.isEmpty()
override fun contains(element: UShort): Boolean = this@asList.contains(element)
override fun get(index: Int): UShort = this@asList[index]
override fun indexOf(element: UShort): Int = this@asList.indexOf(element)
override fun lastIndexOf(element: UShort): Int = this@asList.lastIndexOf(element)
}
}
/**
* Searches the array or the range of the array for the provided [element] using the binary search algorithm.
* The array is expected to be sorted, otherwise the result is undefined.
libraries/stdlib/test/collections/UnsignedArraysTest.kt
+51 -4
View File
@@ -7,6 +7,7 @@
package test.collections
import test.collections.behaviors.collectionBehavior
import test.collections.behaviors.listBehavior
import kotlin.test.*
fun assertArrayContentEquals(expected: UIntArray, actual: UIntArray, message: String = "") { assertTrue(expected contentEquals actual, message) }
@@ -19,10 +20,10 @@ class UnsignedArraysTest {
@Test
fun collectionBehavior() {
compare(listOf<UByte>(), ubyteArrayOf()) { this.collectionBehavior() }
compare(listOf<UShort>(1), ushortArrayOf(1)) { this.collectionBehavior() }
compare(listOf<UInt>(1, 2), uintArrayOf(1u, 2u)) { this.collectionBehavior() }
compare(listOf<ULong>(1, 2, 3), ulongArrayOf(1u, 2u, 3u)) { this.collectionBehavior() }
compare(listOf<UByte>(), ubyteArrayOf()) { collectionBehavior() }
compare(listOf<UShort>(1), ushortArrayOf(1)) { collectionBehavior() }
compare(listOf<UInt>(1, 2), uintArrayOf(1u, 2u)) { collectionBehavior() }
compare(listOf<ULong>(1, 2, 3), ulongArrayOf(1u, 2u, 3u)) { collectionBehavior() }
}
@Test
@@ -364,4 +365,50 @@ class UnsignedArraysTest {
assertArrayContentEquals(ushortArrayOf(3u, 2u, 1u), ushortArrayOf(1u, 2u, 3u).reversedArray())
assertArrayContentEquals(ulongArrayOf(3u, 2u, 1u), ulongArrayOf(1u, 2u, 3u).reversedArray())
}
@Test
fun asList() {
compare(listOf<UByte>(), ubyteArrayOf().asList()) { listBehavior() }
compare(listOf<UShort>(1), ushortArrayOf(1.toUShort()).asList()) { listBehavior() }
compare(listOf<UInt>(1, 2), uintArrayOf(1u, 2u).asList()) { listBehavior() }
compare(listOf<UInt>(1, 2, 3), uintArrayOf(1u, 2u, 3u).asList()) { listBehavior() }
val ulongs = ulongArrayOf(1uL, 5uL, 7uL)
val ulongsAsList = ulongs.asList()
assertEquals(5uL, ulongsAsList[1])
ulongs[1] = 10
assertEquals(10uL, ulongsAsList[1], "Should reflect changes in original array")
}
@Test
fun slice() {
assertEquals(listOf<UInt>(), uintArrayOf(1, 2, 3).slice(5..1))
assertEquals(listOf<UInt>(2, 3, 9), uintArrayOf(2, 3, 9, 2, 3, 9).slice(listOf(3, 1, 2)))
assertEquals(listOf<UByte>(127, 100), ubyteArrayOf(50, 100, 127).slice(2 downTo 1))
assertEquals(listOf<UShort>(200, 100), ushortArrayOf(50, 100, 200).slice(2 downTo 1))
assertEquals(listOf<ULong>(100, 200, 30), ulongArrayOf(50, 100, 200, 30).slice(1..3))
for (range in listOf(-1 until 0, 0 until 2, 2..2)) {
val bounds = "range: $range"
val exClass = IndexOutOfBoundsException::class
assertFailsWith(exClass, bounds) { uintArrayOf(1).slice(range) }
assertFailsWith(exClass, bounds) { ulongArrayOf(1).slice(range) }
}
}
@Test
fun sliceArray() {
assertArrayContentEquals(uintArrayOf(), uintArrayOf(1, 2, 3).sliceArray(5..1))
assertArrayContentEquals(uintArrayOf(2, 3, 9), uintArrayOf(2, 3, 9, 2, 3, 9).sliceArray(listOf(3, 1, 2)))
assertArrayContentEquals(ubyteArrayOf(127, 100), ubyteArrayOf(50, 100, 127).sliceArray(listOf(2, 1)))
assertArrayContentEquals(ushortArrayOf(200, 100), ushortArrayOf(50, 100, 200).sliceArray(listOf(2, 1)))
assertArrayContentEquals(ulongArrayOf(100, 200, 30), ulongArrayOf(50, 100, 200, 30).sliceArray(1..3))
for (range in listOf(-1 until 0, 0 until 2, 2..2)) {
val bounds = "range: $range"
val exClass = IndexOutOfBoundsException::class
assertFailsWith(exClass, bounds) { ubyteArrayOf(1).sliceArray(range) }
assertFailsWith(exClass, bounds) { ushortArrayOf(1).sliceArray(range) }
}
}
}
libraries/stdlib/unsigned/src/kotlin/UByteArray.kt
+1 -2
View File
@@ -46,8 +46,7 @@ internal constructor(@PublishedApi internal val storage: ByteArray) : Collection
}
override fun containsAll(elements: Collection<UByte>): Boolean {
if ((elements as Collection<Any?>).any { it as? UByte == null }) return false
return elements.all { storage.contains(it.toByte()) }
return (elements as Collection<*>).all { it is UByte && storage.contains(it.toByte()) }
}
override fun isEmpty(): Boolean = this.storage.size == 0
libraries/stdlib/unsigned/src/kotlin/UIntArray.kt
+1 -2
View File
@@ -46,8 +46,7 @@ internal constructor(@PublishedApi internal val storage: IntArray) : Collection<
}
override fun containsAll(elements: Collection<UInt>): Boolean {
if ((elements as Collection<Any?>).any { it as? UInt == null }) return false
return elements.all { storage.contains(it.toInt()) }
return (elements as Collection<*>).all { it is UInt && storage.contains(it.toInt()) }
}
override fun isEmpty(): Boolean = this.storage.size == 0
libraries/stdlib/unsigned/src/kotlin/ULongArray.kt
+1 -2
View File
@@ -46,8 +46,7 @@ internal constructor(@PublishedApi internal val storage: LongArray) : Collection
}
override fun containsAll(elements: Collection<ULong>): Boolean {
if ((elements as Collection<Any?>).any { it as? ULong == null }) return false
return elements.all { storage.contains(it.toLong()) }
return (elements as Collection<*>).all { it is ULong && storage.contains(it.toLong()) }
}
override fun isEmpty(): Boolean = this.storage.size == 0
libraries/stdlib/unsigned/src/kotlin/UShortArray.kt
+1 -2
View File
@@ -46,8 +46,7 @@ internal constructor(@PublishedApi internal val storage: ShortArray) : Collectio
}
override fun containsAll(elements: Collection<UShort>): Boolean {
if ((elements as Collection<Any?>).any { it as? UShort == null }) return false
return elements.all { storage.contains(it.toShort()) }
return (elements as Collection<*>).all { it is UShort && storage.contains(it.toShort()) }
}
override fun isEmpty(): Boolean = this.storage.size == 0
libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib-runtime-merged.txt
+20
View File
@@ -2287,6 +2287,10 @@ public abstract class kotlin/collections/ShortIterator : java/util/Iterator, kot
}
public final class kotlin/collections/UArraysKt {
public static final fun asList--ajY-9A ([I)Ljava/util/List;
public static final fun asList-GBYM_sE ([B)Ljava/util/List;
public static final fun asList-QwZRm1k ([J)Ljava/util/List;
public static final fun asList-rL5Bavg ([S)Ljava/util/List;
public static final fun binarySearch-2fe2U9s ([IIII)I
public static synthetic fun binarySearch-2fe2U9s$default ([IIIIILjava/lang/Object;)I
public static final fun binarySearch-EtDCXyQ ([SSII)I
@@ -2343,6 +2347,22 @@ public final class kotlin/collections/UArraysKt {
public static final fun singleOrNull-GBYM_sE ([B)Lkotlin/UByte;
public static final fun singleOrNull-QwZRm1k ([J)Lkotlin/ULong;
public static final fun singleOrNull-rL5Bavg ([S)Lkotlin/UShort;
public static final fun slice-F7u83W8 ([JLjava/lang/Iterable;)Ljava/util/List;
public static final fun slice-HwE9HBo ([ILjava/lang/Iterable;)Ljava/util/List;
public static final fun slice-JGPC0-M ([SLjava/lang/Iterable;)Ljava/util/List;
public static final fun slice-JQknh5Q ([BLjava/lang/Iterable;)Ljava/util/List;
public static final fun slice-Q6IL4kU ([SLkotlin/ranges/IntRange;)Ljava/util/List;
public static final fun slice-ZRhS8yI ([JLkotlin/ranges/IntRange;)Ljava/util/List;
public static final fun slice-c0bezYM ([BLkotlin/ranges/IntRange;)Ljava/util/List;
public static final fun slice-tAntMlw ([ILkotlin/ranges/IntRange;)Ljava/util/List;
public static final fun sliceArray-CFIt9YE ([ILjava/util/Collection;)[I
public static final fun sliceArray-Q6IL4kU ([SLkotlin/ranges/IntRange;)[S
public static final fun sliceArray-ZRhS8yI ([JLkotlin/ranges/IntRange;)[J
public static final fun sliceArray-c0bezYM ([BLkotlin/ranges/IntRange;)[B
public static final fun sliceArray-kzHmqpY ([JLjava/util/Collection;)[J
public static final fun sliceArray-ojwP5H8 ([SLjava/util/Collection;)[S
public static final fun sliceArray-tAntMlw ([ILkotlin/ranges/IntRange;)[I
public static final fun sliceArray-xo_DsdI ([BLjava/util/Collection;)[B
public static final fun toTypedArray--ajY-9A ([I)[Lkotlin/UInt;
public static final fun toTypedArray-GBYM_sE ([B)[Lkotlin/UByte;
public static final fun toTypedArray-QwZRm1k ([J)[Lkotlin/ULong;
libraries/tools/kotlin-stdlib-gen/src/templates/Arrays.kt
+24 -4
View File
@@ -1147,7 +1147,7 @@ object ArrayOps : TemplateGroupBase() {
val f_asList = fn("asList()") {
include(ArraysOfObjects, ArraysOfPrimitives)
include(ArraysOfObjects, ArraysOfPrimitives, ArraysOfUnsigned)
} builder {
doc { "Returns a [List] that wraps the original array." }
returns("List<T>")
@@ -1168,13 +1168,33 @@ object ArrayOps : TemplateGroupBase() {
override fun lastIndexOf(element: T): Int = this@asList.lastIndexOf(element)
}
"""
specialFor(ArraysOfPrimitives) {
specialFor(ArraysOfPrimitives, ArraysOfUnsigned) {
on(Platform.JVM) {
body { objectLiteralImpl }
}
on(Platform.JS) {
if (primitive == PrimitiveType.Char) {
body { objectLiteralImpl }
if (primitive == PrimitiveType.Char || primitive in PrimitiveType.unsignedPrimitives) {
body {
"""
return object : AbstractList<T>(), RandomAccess {
override val size: Int get() = this@asList.size
override fun isEmpty(): Boolean = this@asList.isEmpty()
override fun contains(element: T): Boolean = this@asList.contains(element)
override fun get(index: Int): T {
AbstractList.checkElementIndex(index, size)
return this@asList[index]
}
override fun indexOf(element: T): Int {
if ((element as Any?) !is T) return -1
return this@asList.indexOf(element)
}
override fun lastIndexOf(element: T): Int {
if ((element as Any?) !is T) return -1
return this@asList.lastIndexOf(element)
}
}
"""
}
}
else {
inlineOnly()
libraries/tools/kotlin-stdlib-gen/src/templates/Filtering.kt
+21 -6
View File
@@ -17,6 +17,11 @@ object Filtering : TemplateGroupBase() {
sequenceClassification(terminal)
else
sequenceClassification(intermediate, stateless)
specialFor(ArraysOfUnsigned) {
since("1.3")
annotation("@ExperimentalUnsignedTypes")
}
}
}
@@ -832,7 +837,7 @@ object Filtering : TemplateGroupBase() {
val f_slice = fn("slice(indices: Iterable<Int>)") {
include(CharSequences, Strings, Lists, ArraysOfObjects, ArraysOfPrimitives)
include(CharSequences, Strings, Lists, ArraysOfObjects, ArraysOfPrimitives, ArraysOfUnsigned)
} builder {
doc { "Returns a list containing elements at specified [indices]." }
returns("List<T>")
@@ -870,7 +875,7 @@ object Filtering : TemplateGroupBase() {
}
val f_slice_range = fn("slice(indices: IntRange)") {
include(CharSequences, Strings, Lists, ArraysOfObjects, ArraysOfPrimitives)
include(CharSequences, Strings, Lists, ArraysOfObjects, ArraysOfPrimitives, ArraysOfUnsigned)
} builder {
doc { "Returns a list containing elements at indices in the specified [indices] range." }
returns("List<T>")
@@ -880,7 +885,7 @@ object Filtering : TemplateGroupBase() {
return this.subList(indices.start, indices.endInclusive + 1).toList()
"""
}
body(ArraysOfPrimitives, ArraysOfObjects) {
body(ArraysOfPrimitives, ArraysOfObjects, ArraysOfUnsigned) {
"""
if (indices.isEmpty()) return listOf()
return copyOfRange(indices.start, indices.endInclusive + 1).asList()
@@ -900,7 +905,7 @@ object Filtering : TemplateGroupBase() {
}
val f_sliceArray = fn("sliceArray(indices: Collection<Int>)") {
include(InvariantArraysOfObjects, ArraysOfPrimitives)
include(InvariantArraysOfObjects, ArraysOfPrimitives, ArraysOfUnsigned)
} builder {
doc { "Returns an array containing elements of this array at specified [indices]." }
returns("SELF")
@@ -924,12 +929,17 @@ object Filtering : TemplateGroupBase() {
return result
"""
}
body(ArraysOfUnsigned) {
"""
return SELF(storage.sliceArray(indices))
"""
}
}
val f_sliceArrayRange = fn("sliceArray(indices: IntRange)") {
include(InvariantArraysOfObjects, ArraysOfPrimitives)
include(InvariantArraysOfObjects, ArraysOfPrimitives, ArraysOfUnsigned)
} builder {
doc { "Returns a list containing elements at indices in the specified [indices] range." }
doc { "Returns an array containing elements at indices in the specified [indices] range." }
returns("SELF")
body(InvariantArraysOfObjects) {
"""
@@ -943,5 +953,10 @@ object Filtering : TemplateGroupBase() {
return copyOfRange(indices.start, indices.endInclusive + 1)
"""
}
body(ArraysOfUnsigned) {
"""
return SELF(storage.sliceArray(indices))
"""
}
}
}