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

Nullable-specific routines now respect the fact that <T> may be instantiated with a nullable type

Browse Source
This commit is contained in:
Andrey Breslav
2012-10-09 05:38:36 +04:00
parent 8a9485bd5f
commit 7d28ee4342
1 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/stdlib/src/kotlin/nullable/Nullables.kt
+25 -25
View File
@@ -3,40 +3,40 @@ package kotlin.nullable
import java.util.*
/** Returns true if the element is not null and matches the given predicate */
public inline fun <T> T?.any(predicate: (T)-> Boolean): Boolean {
public inline fun <T: Any> T?.any(predicate: (T)-> Boolean): Boolean {
return this != null && predicate(this)
}
/** Returns true if the element is not null and matches the given predicate */
public inline fun <T> T?.all(predicate: (T)-> Boolean): Boolean {
public inline fun <T: Any> T?.all(predicate: (T)-> Boolean): Boolean {
return this != null && predicate(this)
}
/** Returns the 1 if the element is not null else 0 */
public inline fun <T> T?.count(predicate: (T)-> Boolean): Int {
public inline fun <T: Any> T?.count(predicate: (T)-> Boolean): Int {
return if (this != null) 1 else 0
}
/** Returns the first item which matches the predicate if this element is not null else null */
public inline fun <T> T?.find(predicate: (T)-> Boolean): T? {
public inline fun <T: Any> T?.find(predicate: (T)-> Boolean): T? {
return if (this != null && predicate(this)) this else null
}
/** Returns a new List containing all elements in this collection which match the given predicate */
public inline fun <T> T?.filter(predicate: (T)-> Boolean): T? = find(predicate)
public inline fun <T: Any> T?.filter(predicate: (T)-> Boolean): T? = find(predicate)
/** Filters all elements in this collection which match the given predicate into the given result collection */
public inline fun <T, C: MutableCollection<in T>> T?.filterTo(result: C, predicate: (T)-> Boolean): C {
public inline fun <T: Any, C: MutableCollection<in T>> T?.filterTo(result: C, predicate: (T)-> Boolean): C {
if (this != null && predicate(this))
result.add(this)
return result
}
/** Returns a List containing all the non null elements in this collection */
public inline fun <T> T?.filterNotNull(): Collection<T> = filterNotNullTo(java.util.ArrayList<T>())
public inline fun <T: Any> T?.filterNotNull(): Collection<T> = filterNotNullTo(java.util.ArrayList<T>())
/** Filters all the null elements in this collection winto the given result collection */
public inline fun <T, C: MutableCollection<in T>> T?.filterNotNullTo(result: C): C {
public inline fun <T: Any, C: MutableCollection<in T>> T?.filterNotNullTo(result: C): C {
if (this != null) {
result.add(this)
}
@@ -44,10 +44,10 @@ public inline fun <T, C: MutableCollection<in T>> T?.filterNotNullTo(result: C):
}
/** Returns a new collection containing all elements in this collection which do not match the given predicate */
public inline fun <T> T?.filterNot(predicate: (T)-> Boolean): Collection<T> = filterNotTo(ArrayList<T>(), predicate)
public inline fun <T: Any> T?.filterNot(predicate: (T)-> Boolean): Collection<T> = filterNotTo(ArrayList<T>(), predicate)
/** Returns a new collection containing all elements in this collection which do not match the given predicate */
public inline fun <T, C: MutableCollection<in T>> T?.filterNotTo(result: C, predicate: (T)-> Boolean): C {
public inline fun <T: Any, C: MutableCollection<in T>> T?.filterNotTo(result: C, predicate: (T)-> Boolean): C {
if (this != null && !predicate(this)) {
result.add(this)
}
@@ -58,7 +58,7 @@ public inline fun <T, C: MutableCollection<in T>> T?.filterNotTo(result: C, pred
* Returns the result of transforming each item in the collection to a one or more values which
* are concatenated together into a single collection
*/
public inline fun <T, R> T?.flatMap(transform: (T)-> MutableCollection<R>): Collection<R> {
public inline fun <T: Any, R> T?.flatMap(transform: (T)-> MutableCollection<R>): Collection<R> {
return flatMapTo(ArrayList<R>(), transform)
}
@@ -66,7 +66,7 @@ public inline fun <T, R> T?.flatMap(transform: (T)-> MutableCollection<R>): Coll
* Returns the result of transforming each item in the collection to a one or more values which
* are concatenated together into a single collection
*/
public inline fun <T, R> T?.flatMapTo(result: MutableCollection<R>, transform: (T)-> MutableCollection<R>): Collection<R> {
public inline fun <T: Any, R> T?.flatMapTo(result: MutableCollection<R>, transform: (T)-> MutableCollection<R>): Collection<R> {
if (this != null) {
val coll = transform(this)
if (coll != null) {
@@ -79,7 +79,7 @@ public inline fun <T, R> T?.flatMapTo(result: MutableCollection<R>, transform: (
}
/** Performs the given operation on each element inside the collection */
public inline fun <T> T?.forEach(operation: (element: T) -> Unit) {
public inline fun <T: Any> T?.forEach(operation: (element: T) -> Unit) {
if (this != null) {
operation(this)
}
@@ -91,7 +91,7 @@ public inline fun <T> T?.forEach(operation: (element: T) -> Unit) {
* For example to sum together all numeric values in a collection of numbers it would be
* {code}val total = numbers.fold(0){(a, b) -> a + b}{code}
*/
public inline fun <T> T?.fold(initial: T, operation: (it: T, it2: T) -> T): T {
public inline fun <T: Any> T?.fold(initial: T, operation: (it: T, it2: T) -> T): T {
return if (this != null) {
operation(initial, this)
} else {
@@ -102,7 +102,7 @@ public inline fun <T> T?.fold(initial: T, operation: (it: T, it2: T) -> T): T {
/**
* Folds all the values from right to left with the initial value to perform the operation on sequential pairs of values
*/
public inline fun <T> T?.foldRight(initial: T, operation: (it: T, it2: T) -> T): T {
public inline fun <T: Any> T?.foldRight(initial: T, operation: (it: T, it2: T) -> T): T {
// maximum size is 1 so reverse is not needed
return fold(initial, {x, y -> operation(y, x)})
}
@@ -111,7 +111,7 @@ public inline fun <T> T?.foldRight(initial: T, operation: (it: T, it2: T) -> T):
* Iterates through the collection performing the transformation on each element and using the result
* as the key in a map to group elements by the result
*/
public inline fun <T, K> T?.groupBy(result: MutableMap<K, MutableList<T>> = HashMap<K, MutableList<T>>(), toKey: (T)-> K): Map<K, MutableList<T>> {
public inline fun <T: Any, K> T?.groupBy(result: MutableMap<K, MutableList<T>> = HashMap<K, MutableList<T>>(), toKey: (T)-> K): Map<K, MutableList<T>> {
if (this != null) {
val key = toKey(this)
val list = result.getOrPut(key){ ArrayList<T>() }
@@ -122,7 +122,7 @@ public inline fun <T, K> T?.groupBy(result: MutableMap<K, MutableList<T>> = Hash
/** Creates a String from the nullable or item with the given prefix and postfix if supplied */
public inline fun <T> T?.makeString(separator: String = ", ", prefix: String = "", postfix: String = ""): String {
public inline fun <T: Any> T?.makeString(separator: String = ", ", prefix: String = "", postfix: String = ""): String {
val buffer = StringBuilder(prefix)
var first = true
if (this != null) {
@@ -134,7 +134,7 @@ public inline fun <T> T?.makeString(separator: String = ", ", prefix: String = "
/** Returns the nullable result of transforming this with the given transformation function */
public inline fun <T, R> T?.map(transform : (T) -> R) : R? {
public inline fun <T: Any, R> T?.map(transform : (T) -> R) : R? {
return if (this != null) {
transform(this)
} else {
@@ -143,7 +143,7 @@ public inline fun <T, R> T?.map(transform : (T) -> R) : R? {
}
/** Transforms each element of this collection with the given function then adds the results to the given collection */
public inline fun <T, R, C: MutableCollection<in R>> T?.mapTo(result: C, transform : (T) -> R) : C {
public inline fun <T: Any, R, C: MutableCollection<in R>> T?.mapTo(result: C, transform : (T) -> R) : C {
if (this != null) {
result.add(transform(this))
}
@@ -151,28 +151,28 @@ public inline fun <T, R, C: MutableCollection<in R>> T?.mapTo(result: C, transfo
}
/** Returns itself since it can't be reversed as it can contain at most one item */
public inline fun <T> T?.reverse(): T? {
public inline fun <T: Any> T?.reverse(): T? {
return this
}
/** Copies the collection into the given collection */
public inline fun <T, C: MutableCollection<T>> T?.toCollection(result: C): C {
public inline fun <T: Any, C: MutableCollection<T>> T?.toCollection(result: C): C {
if (this != null)
result.add(this)
return result
}
/** Converts the collection into a LinkedList */
public inline fun <T> T?.toLinkedList(): LinkedList<T> = this.toCollection(LinkedList<T>())
public inline fun <T: Any> T?.toLinkedList(): LinkedList<T> = this.toCollection(LinkedList<T>())
/** Converts the collection into a List */
public inline fun <T> T?.toList(): List<T> = this.toCollection(ArrayList<T>())
public inline fun <T: Any> T?.toList(): List<T> = this.toCollection(ArrayList<T>())
/** Converts the collection into a Set */
public inline fun <T> T?.toSet(): Set<T> = this.toCollection(HashSet<T>())
public inline fun <T: Any> T?.toSet(): Set<T> = this.toCollection(HashSet<T>())
/** Converts the collection into a SortedSet */
public inline fun <T> T?.toSortedSet(): SortedSet<T> = this.toCollection(TreeSet<T>())
public inline fun <T: Any> T?.toSortedSet(): SortedSet<T> = this.toCollection(TreeSet<T>())
/**
TODO figure out necessary variance/generics ninja stuff... :)
public inline fun <in T> T?.toSortedList(transform: fun(T) : java.lang.Comparable<*>) : List<T> {