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

compareBy and related Comparator constructors have the same null-comparison semantics as compareValuesBy.

Browse Source
This commit is contained in:
Ilya Gorbunov
2015-07-27 18:47:56 +03:00
parent 0f5c3678f8
commit 5eb69334b4
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/stdlib/src/kotlin/util/Ordering.kt
+4 -4
View File
@@ -92,7 +92,7 @@ public fun <T> comparator(vararg functions: (T) -> Comparable<*>?): Comparator<T
*/
inline public fun <T> compareBy(inlineOptions(InlineOption.ONLY_LOCAL_RETURN) comparable: (T) -> Comparable<*>?): Comparator<T> {
return object : Comparator<T> {
public override fun compare(a: T, b: T): Int = compareValues(comparable(a), comparable(b))
public override fun compare(a: T, b: T): Int = compareValuesBy(a, b, comparable)
}
}
@@ -101,7 +101,7 @@ inline public fun <T> compareBy(inlineOptions(InlineOption.ONLY_LOCAL_RETURN) co
*/
inline public fun <T> compareByDescending(inlineOptions(InlineOption.ONLY_LOCAL_RETURN) comparable: (T) -> Comparable<*>?): Comparator<T> {
return object : Comparator<T> {
public override fun compare(a: T, b: T): Int = compareValues(comparable(b), comparable(a))
public override fun compare(a: T, b: T): Int = compareValuesBy(b, a, comparable)
}
}
@@ -113,7 +113,7 @@ inline public fun <T> Comparator<T>.thenBy(inlineOptions(InlineOption.ONLY_LOCAL
return object : Comparator<T> {
public override fun compare(a: T, b: T): Int {
val previousCompare = this@thenBy.compare(a, b)
return if (previousCompare != 0) previousCompare else compareValues(comparable(a), comparable(b))
return if (previousCompare != 0) previousCompare else compareValuesBy(a, b, comparable)
}
}
}
@@ -126,7 +126,7 @@ inline public fun <T> Comparator<T>.thenByDescending(inlineOptions(InlineOption.
return object : Comparator<T> {
public override fun compare(a: T, b: T): Int {
val previousCompare = this@thenByDescending.compare(a, b)
return if (previousCompare != 0) previousCompare else compareValues(comparable(b), comparable(a))
return if (previousCompare != 0) previousCompare else compareValuesBy(b, a, comparable)
}
}
}