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

renamed the sort() methods on Iterable which create a new List and sort that as "toSortedList()" instead which is more accurate.

Browse Source
This commit is contained in:
James Strachan
2011-12-18 08:15:39 +00:00
parent b9c1b2cbfe
commit 7e93494e2f
2 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stdlib/ktSrc/JavaUtil.kt
+22 -15
View File
@@ -141,13 +141,13 @@ inline fun <T, R> java.util.Collection<T>.map(transform : fun(T) : R) : Collecti
return result
}
inline fun <in T: java.lang.Comparable<T>> java.lang.Iterable<T>.sort() : List<T> {
inline fun <in T: java.lang.Comparable<T>> java.lang.Iterable<T>.toSortedList() : List<T> {
val answer = this.toList()
answer.sort()
return answer
}
inline fun <in T: java.lang.Comparable<T>> java.lang.Iterable<T>.sort(comparator: java.util.Comparator<T>) : List<T> {
inline fun <in T: java.lang.Comparable<T>> java.lang.Iterable<T>.toSortedList(comparator: java.util.Comparator<T>) : List<T> {
val answer = this.toList()
answer.sort(comparator)
return answer
@@ -155,20 +155,9 @@ inline fun <in T: java.lang.Comparable<T>> java.lang.Iterable<T>.sort(comparator
/**
TODO figure out necessary variance/generics ninja stuff... :)
inline fun <in T> java.lang.Iterable<T>.sort(transform: fun(T) : java.lang.Comparable<*>) : List<T> {
inline fun <in T> java.lang.Iterable<T>.toSortedList(transform: fun(T) : java.lang.Comparable<*>) : List<T> {
val answer = this.toList()
val comparator = java.util.Comparator<T>() {
fun compare(o1: T, o2: T): Int {
val v1 = transform(o1)
val v2 = transform(o2)
if (v1 == v2) {
return 0
} else {
return v1.compareTo(v2)
}
}
}
answer.sort(comparator)
answer.sort(transform)
return answer
}
*/
@@ -207,6 +196,24 @@ inline fun <in T: java.lang.Comparable<T>> List<T>.sort(comparator: java.util.Co
Collections.sort(this, comparator)
}
/**
TODO figure out necessary variance/generics ninja stuff... :)
inline fun <in T> List<T>.sort(transform: fun(T) : java.lang.Comparable<*>) : List<T> {
val comparator = java.util.Comparator<T>() {
fun compare(o1: T, o2: T): Int {
val v1 = transform(o1)
val v2 = transform(o2)
if (v1 == v2) {
return 0
} else {
return v1.compareTo(v2)
}
}
}
answer.sort(comparator)
}
*/
val <T> List<T>.head : T?
get() = this.get(0)