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

tidied up the compareBy helper function a little; only compare based on the functions given

Browse Source
This commit is contained in:
James Strachan
2012-03-26 15:06:56 +01:00
parent bc17c7b4f3
commit 2803dfca08
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/KDocConfig.kt
+1 -1
View File
@@ -95,7 +95,7 @@ class KDocConfig() {
protected class LongestFirstStringComparator() : Comparator<String> { protected class LongestFirstStringComparator() : Comparator<String> {
override fun compare(s1: String?, s2: String?): Int { override fun compare(s1: String?, s2: String?): Int {
return compareBy(s1, s2, { (s: String) -> s.length() }) return compareBy(s1, s2, { (s: String) -> s.length() }, { (s: String) -> s })
} }
override fun equals(obj : Any?) : Boolean { override fun equals(obj : Any?) : Boolean {
libraries/stdlib/src/Ordering.kt
+6 -7
View File
@@ -1,14 +1,13 @@
package kotlin package kotlin
import java.lang.Iterable
import java.util.Comparator
import java.util.Comparator import java.util.Comparator
/** /**
* Helper method for implementing [[Comparable<T>]] methods using a list of functions * Helper method for implementing [[Comparable<T>]] methods using a list of functions
* to calculate the values to compare * to calculate the values to compare
*/ */
inline fun <T> compareBy(a: T?, b: T?, vararg functions: Function1<T,Any?>): Int { inline fun <T> compareBy(a: T?, b: T?, vararg functions: Function1<T, Any?>): Int {
require(functions.size > 0)
if (a === b) return 0 if (a === b) return 0
if (a == null) return - 1 if (a == null) return - 1
if (b == null) return 1 if (b == null) return 1
@@ -18,7 +17,7 @@ inline fun <T> compareBy(a: T?, b: T?, vararg functions: Function1<T,Any?>): Int
val diff = compareValues(v1, v2) val diff = compareValues(v1, v2)
if (diff != null) return diff if (diff != null) return diff
} }
return compareValues(a, b) return 0
} }
/** /**