Implement plus for sequence as operand and refactor plus tests.

This commit is contained in:
Ilya Gorbunov
2015-07-10 20:01:25 +03:00
parent 0ee960da50
commit 048a3ebcc1
7 changed files with 127 additions and 73 deletions
@@ -717,6 +717,26 @@ public fun <T> Set<T>.plus(element: T): Set<T> {
return result
}
/**
* Returns a list containing all elements of the original collection and then all elements of the given [sequence].
*/
public fun <T> Collection<T>.plus(sequence: Sequence<T>): List<T> {
val result = ArrayList<T>(this.size() + 10)
result.addAll(this)
result.addAll(sequence)
return result
}
/**
* Returns a list containing all elements of the original collection and then all elements of the given [sequence].
*/
public fun <T> Iterable<T>.plus(sequence: Sequence<T>): List<T> {
val result = ArrayList<T>()
result.addAll(this)
result.addAll(sequence)
return result
}
/**
* Returns a sequence containing all elements of original sequence and then all elements of the given [sequence].
*/
@@ -724,6 +744,16 @@ public fun <T> Sequence<T>.plus(sequence: Sequence<T>): Sequence<T> {
return sequenceOf(this, sequence).flatten()
}
/**
* Returns a set containing all elements both of the original set and the given [sequence].
*/
public fun <T> Set<T>.plus(sequence: Sequence<T>): Set<T> {
val result = LinkedHashSet<T>(mapCapacity(this.size() * 2))
result.addAll(this)
result.addAll(sequence)
return result
}
/**
* Returns a list of pairs built from elements of both collections with same indexes. List has length of shortest collection.
*/