From 87745c05ae86c3e45370883007b0478be55b0131 Mon Sep 17 00:00:00 2001 From: Ilya Ryzhenkov Date: Fri, 18 Apr 2014 18:09:00 +0400 Subject: [PATCH] Fix filterNotNull and mapNotNull for streams. --- libraries/stdlib/src/generated/_Filtering.kt | 2 +- libraries/stdlib/src/generated/_Mapping.kt | 2 +- libraries/tools/kotlin-stdlib-gen/src/templates/Filtering.kt | 2 +- libraries/tools/kotlin-stdlib-gen/src/templates/Mapping.kt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/stdlib/src/generated/_Filtering.kt b/libraries/stdlib/src/generated/_Filtering.kt index 8ecb6a90913..881dd979fc1 100644 --- a/libraries/stdlib/src/generated/_Filtering.kt +++ b/libraries/stdlib/src/generated/_Filtering.kt @@ -561,7 +561,7 @@ public fun Iterable.filterNotNull(): List { * Returns a stream containing all elements that are not null */ public fun Stream.filterNotNull(): Stream { - return FilteringStream(this, false, { it != null }) as Stream + return FilteringStream(this, false, { it == null }) as Stream } /** diff --git a/libraries/stdlib/src/generated/_Mapping.kt b/libraries/stdlib/src/generated/_Mapping.kt index 3eedff79f2b..36f29d62c67 100644 --- a/libraries/stdlib/src/generated/_Mapping.kt +++ b/libraries/stdlib/src/generated/_Mapping.kt @@ -597,7 +597,7 @@ public inline fun Iterable.mapNotNull(transform: (T) -> R): Lis * Returns a stream containing the results of applying the given *transform* function to each non-null element of the original stream */ public fun Stream.mapNotNull(transform: (T) -> R): Stream { - return TransformingStream(FilteringStream(this, false, { it != null }) as Stream, transform) + return TransformingStream(FilteringStream(this, false, { it == null }) as Stream, transform) } /** diff --git a/libraries/tools/kotlin-stdlib-gen/src/templates/Filtering.kt b/libraries/tools/kotlin-stdlib-gen/src/templates/Filtering.kt index 5ffa35d88ea..949ad834695 100644 --- a/libraries/tools/kotlin-stdlib-gen/src/templates/Filtering.kt +++ b/libraries/tools/kotlin-stdlib-gen/src/templates/Filtering.kt @@ -305,7 +305,7 @@ fun filtering(): List { returns(Streams) { "Stream" } body(Streams) { """ - return FilteringStream(this, false, { it != null }) as Stream + return FilteringStream(this, false, { it == null }) as Stream """ } } diff --git a/libraries/tools/kotlin-stdlib-gen/src/templates/Mapping.kt b/libraries/tools/kotlin-stdlib-gen/src/templates/Mapping.kt index 55fff0b121a..b1416a96181 100644 --- a/libraries/tools/kotlin-stdlib-gen/src/templates/Mapping.kt +++ b/libraries/tools/kotlin-stdlib-gen/src/templates/Mapping.kt @@ -63,7 +63,7 @@ fun mapping(): List { inline(false, Streams) body(Streams) { """ - return TransformingStream(FilteringStream(this, false, { it != null }) as Stream, transform) + return TransformingStream(FilteringStream(this, false, { it == null }) as Stream, transform) """ } }