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

Fix Array.sort failure in case of empty range

Browse Source 
(cherry picked from commit ae389ecdb0a1d2624d0f4c5d557a707693421570)
This commit is contained in:
Abduqodiri Qurbonzoda
2020-04-21 18:45:35 +03:00
committed by Vasily Levchenko
parent a2b760d338
commit 2f570bd58f
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
runtime/src/main/kotlin/kotlin/collections/ArraySorting.kt
+11 -8
View File
@@ -11,7 +11,7 @@ private fun <T: Comparable<T>> mergeSort(array: Array<T>, start: Int, endInclusi
val buffer = arrayOfNulls<Any?>(array.size) as Array<T> val buffer = arrayOfNulls<Any?>(array.size) as Array<T>
val result = mergeSort(array, buffer, start, endInclusive) val result = mergeSort(array, buffer, start, endInclusive)
if (result !== array) { if (result !== array) {
result.forEachIndexed { i, v -> array[i] = v } for (i in start..endInclusive) array[i] = result[i]
} }
} }
@@ -64,7 +64,7 @@ private fun <T> mergeSort(array: Array<T>, start: Int, endInclusive: Int, compar
val buffer = arrayOfNulls<Any?>(array.size) as Array<T> val buffer = arrayOfNulls<Any?>(array.size) as Array<T>
val result = mergeSort(array, buffer, start, endInclusive, comparator) val result = mergeSort(array, buffer, start, endInclusive, comparator)
if (result !== array) { if (result !== array) {
result.forEachIndexed { i, v -> array[i] = v } for (i in start..endInclusive) array[i] = result[i]
} }
} }
@@ -364,10 +364,11 @@ private fun quickSort(
* Sorts the subarray specified by [fromIndex] (inclusive) and [toIndex] (exclusive) parameters * Sorts the subarray specified by [fromIndex] (inclusive) and [toIndex] (exclusive) parameters
* using the merge sort algorithm with the given [comparator]. * using the merge sort algorithm with the given [comparator].
*/ */
internal fun <T> sortArrayWith( internal fun <T> sortArrayWith(array: Array<out T>, fromIndex: Int, toIndex: Int, comparator: Comparator<T>) {
array: Array<out T>, fromIndex: Int = 0, toIndex: Int = array.size, comparator: Comparator<T>) { if (fromIndex < toIndex - 1) {
@Suppress("UNCHECKED_CAST") @Suppress("UNCHECKED_CAST")
mergeSort(array as Array<T>, fromIndex, toIndex - 1, comparator) mergeSort(array as Array<T>, fromIndex, toIndex - 1, comparator)
}
} }
/** /**
@@ -375,8 +376,10 @@ internal fun <T> sortArrayWith(
* [toIndex] (exclusive) parameters using the merge sort algorithm. * [toIndex] (exclusive) parameters using the merge sort algorithm.
*/ */
internal fun <T: Comparable<T>> sortArray(array: Array<out T>, fromIndex: Int, toIndex: Int) { internal fun <T: Comparable<T>> sortArray(array: Array<out T>, fromIndex: Int, toIndex: Int) {
@Suppress("UNCHECKED_CAST") if (fromIndex < toIndex - 1) {
mergeSort(array as Array<T>, fromIndex, toIndex - 1) @Suppress("UNCHECKED_CAST")
mergeSort(array as Array<T>, fromIndex, toIndex - 1)
}
} }
/** /**