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

Ensure stable sorting in MutableList.sort/sortWith

Browse Source 
MutableList.sortWith now works correctly in JS_IR backend too

#KT-12473
This commit is contained in:
Ilya Gorbunov
2019-01-16 02:17:34 +03:00
parent 7191624a92
commit 56672c2564
7 changed files with 49 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/stdlib/test/collections/ArraysTest.kt
+3 -13
View File
@@ -1451,8 +1451,8 @@ class ArraysTest {
for (size in listOf(10, 100, 2000)) {
val array = Array(size) { index -> Sortable(keyRange.random(), index) }
array.sortedBy { it.key }.iterator().assertStableSorted()
array.sortedByDescending { it.key }.iterator().assertStableSorted(descending = true)
array.sortedBy { it.key }.assertStableSorted()
array.sortedByDescending { it.key }.assertStableSorted(descending = true)
array.sortBy { it.key }
array.assertStableSorted()
@@ -1488,20 +1488,10 @@ class ArraysTest {
}
}
private data class Sortable<K : Comparable<K>>(val key: K, val index: Int) : Comparable<Sortable<K>> {
override fun compareTo(other: Sortable<K>): Int = this.key.compareTo(other.key)
}
private fun <K : Comparable<K>> Array<out Sortable<K>>.assertStableSorted(descending: Boolean = false) =
fun <K : Comparable<K>> Array<out Sortable<K>>.assertStableSorted(descending: Boolean = false) =
iterator().assertStableSorted(descending = descending)
private fun <K : Comparable<K>> Iterator<Sortable<K>>.assertStableSorted(descending: Boolean = false) {
assertSorted { a, b ->
val relation = a.key.compareTo(b.key)
(if (descending) relation > 0 else relation < 0) || relation == 0 && a.index < b.index
}
}
private class ArraySortedChecker<A, T>(val array: A, val comparator: Comparator<in T>) {
public fun <R> checkSorted(sorted: A.() -> R, sortedDescending: A.() -> R, iterator: R.() -> Iterator<T>) {
array.sorted().iterator().assertSorted { a, b -> comparator.compare(a, b) <= 0 }