Deprecate sequence implementations in favor of sequence operations.

This commit is contained in:
Ilya Gorbunov
2015-04-15 20:05:47 +03:00
parent b2b98502e9
commit 58310d172f
10 changed files with 34 additions and 38 deletions
@@ -351,7 +351,7 @@ fun filtering(): List<GenericFunction> {
returns(Sequences) { "Sequence<T>" }
body(Sequences) {
"""
return FilteringSequence(this, false, { it == null }) as Sequence<T>
return filterNot { it == null } as Sequence<T>
"""
}
}
@@ -21,7 +21,7 @@ fun generators(): List<GenericFunction> {
returns(Sequences) { "Sequence<T>" }
body(Sequences) {
"""
return MultiSequence(sequenceOf(this, sequenceOf(element)))
return sequenceOf(this, sequenceOf(element)).flatten()
"""
}
}
@@ -58,7 +58,7 @@ fun generators(): List<GenericFunction> {
returns("Sequence<T>")
body {
"""
return MultiSequence(sequenceOf(this, collection.sequence()))
return sequenceOf(this, collection.sequence()).flatten()
"""
}
}
@@ -69,7 +69,7 @@ fun generators(): List<GenericFunction> {
returns("Sequence<T>")
body {
"""
return MultiSequence(sequenceOf(this, sequence))
return sequenceOf(this, sequence).flatten()
"""
}
}
@@ -27,12 +27,7 @@ fun guards(): List<GenericFunction> {
}
body(Sequences) {
"""
return FilteringSequence(this) {
if (it == null) {
throw IllegalArgumentException("null element found in $THIS")
}
true
} as Sequence<T>
return map { it ?: throw IllegalArgumentException("null element found in $THIS") }
"""
}
}
@@ -106,7 +106,7 @@ fun specialJVM(): List<GenericFunction> {
returns(Sequences) { "Sequence<R>" }
body(Sequences) {
"""
return FilteringSequence(this, true, { klass.isInstance(it) }) as Sequence<R>
return filter { klass.isInstance(it) } as Sequence<R>
"""
}
}
@@ -146,7 +146,7 @@ fun specialJVM(): List<GenericFunction> {
receiverAsterisk(true)
body(Sequences) {
"""
return FilteringSequence(this, true, { it is R }) as Sequence<R>
return filter { it is R } as Sequence<R>
"""
}
}