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

Move buildSequence/buildIterator to kotlin.coroutines.experimental

Browse Source
This commit is contained in:
Denis Zharkov
2017-01-27 15:01:54 +03:00
parent 35e9f0a89a
commit 246946bc18
5 changed files with 73 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/stdlib/src/kotlin/collections/Iterators.kt
-6
View File
@@ -3,12 +3,6 @@
package kotlin.collections
/**
* Builds an [Iterator] lazily yielding values one by one.
*/
@SinceKotlin("1.1")
public fun <T> buildIterator(builderAction: suspend SequenceBuilder<T>.() -> Unit): Iterator<T> = buildIteratorImpl(builderAction)
/**
* Creates an [Iterator] for an [Enumeration], allowing to use it in `for` loops.
*/
libraries/stdlib/src/kotlin/collections/SequenceBuilder.kt → libraries/stdlib/src/kotlin/coroutines/experimental/SequenceBuilder.kt
+29 -17
View File
@@ -1,16 +1,40 @@
@file:kotlin.jvm.JvmMultifileClass
@file:kotlin.jvm.JvmName("SequencesKt")
package kotlin.sequences
/*
* Copyright 2010-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
@file:kotlin.jvm.JvmMultifileClass
@file:kotlin.jvm.JvmName("SequenceBuilderKt")
package kotlin.coroutines.experimental
import kotlin.coroutines.experimental.*
import kotlin.coroutines.experimental.intrinsics.*
/**
* Builds a [Sequence] lazily yielding values one by one.
*/
@SinceKotlin("1.1")
public fun <T> buildSequence(builderAction: suspend SequenceBuilder<T>.() -> Unit): Sequence<T> = Sequence { buildIteratorImpl(builderAction) }
public fun <T> buildSequence(builderAction: suspend SequenceBuilder<T>.() -> Unit): Sequence<T> = Sequence { buildIterator(builderAction) }
/**
* Builds an [Iterator] lazily yielding values one by one.
*/
@SinceKotlin("1.1")
public fun <T> buildIterator(builderAction: suspend SequenceBuilder<T>.() -> Unit): Iterator<T> {
val iterator = SequenceBuilderIterator<T>()
iterator.nextStep = builderAction.createCoroutine(receiver = iterator, completion = iterator)
return iterator
}
/**
* Builder for a [Sequence] or an [Iterator], provides [yield] and [yieldAll] suspension functions.
@@ -46,17 +70,6 @@ public abstract class SequenceBuilder<in T> internal constructor() {
public suspend fun yieldAll(sequence: Sequence<T>) = yieldAll(sequence.iterator())
}
internal fun <T> buildIteratorImpl(builderAction: suspend SequenceBuilder<T>.() -> Unit): Iterator<T> {
val iterator = SequenceBuilderIterator<T>()
iterator.nextStep = builderAction.createCoroutine(receiver = iterator, completion = iterator)
return iterator
}
private typealias State = Int
private const val State_NotReady: State = 0
private const val State_ManyReady: State = 1
@@ -64,7 +77,6 @@ private const val State_Ready: State = 2
private const val State_Done: State = 3
private const val State_Failed: State = 4
private class SequenceBuilderIterator<T> : SequenceBuilder<T>(), Iterator<T>, Continuation<Unit> {
private var state = State_NotReady
private var nextValue: T? = null
libraries/stdlib/test/collections/SequenceBuilderTest.kt → libraries/stdlib/test/coroutines/SequenceBuilderTest.kt
+20 -2
View File
@@ -1,7 +1,25 @@
package test.collections
/*
* Copyright 2010-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package test.coroutines
import org.junit.Test
import kotlin.test.*
import kotlin.coroutines.experimental.buildSequence
import kotlin.coroutines.experimental.buildIterator
class SequenceBuilderTest {
@Test
@@ -269,4 +287,4 @@ class SequenceBuilderTest {
effects.toList()
)
}
}
}
libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib-runtime-merged.txt
+12 -9
View File
@@ -1565,7 +1565,6 @@ public final class kotlin/collections/CollectionsKt {
public static synthetic fun binarySearch$default (Ljava/util/List;Ljava/lang/Object;Ljava/util/Comparator;IIILjava/lang/Object;)I
public static final fun binarySearchBy (Ljava/util/List;Ljava/lang/Comparable;IILkotlin/jvm/functions/Function1;)I
public static synthetic fun binarySearchBy$default (Ljava/util/List;Ljava/lang/Comparable;IILkotlin/jvm/functions/Function1;ILjava/lang/Object;)I
public static final fun buildIterator (Lkotlin/jvm/functions/Function2;)Ljava/util/Iterator;
public static final fun collectionSizeOrDefault (Ljava/lang/Iterable;I)I
public static final fun collectionSizeOrNull (Ljava/lang/Iterable;)Ljava/lang/Integer;
public static final fun contains (Ljava/lang/Iterable;Ljava/lang/Object;)Z
@@ -2010,6 +2009,18 @@ public final class kotlin/coroutines/experimental/SafeContinuation : kotlin/coro
public final class kotlin/coroutines/experimental/SafeContinuation$Companion {
}
public abstract class kotlin/coroutines/experimental/SequenceBuilder {
public abstract fun yield (Ljava/lang/Object;Lkotlin/coroutines/experimental/Continuation;)Ljava/lang/Object;
public final fun yieldAll (Ljava/lang/Iterable;Lkotlin/coroutines/experimental/Continuation;)Ljava/lang/Object;
public abstract fun yieldAll (Ljava/util/Iterator;Lkotlin/coroutines/experimental/Continuation;)Ljava/lang/Object;
public final fun yieldAll (Lkotlin/sequences/Sequence;Lkotlin/coroutines/experimental/Continuation;)Ljava/lang/Object;
}
public final class kotlin/coroutines/experimental/SequenceBuilderKt {
public static final fun buildIterator (Lkotlin/jvm/functions/Function2;)Ljava/util/Iterator;
public static final fun buildSequence (Lkotlin/jvm/functions/Function2;)Lkotlin/sequences/Sequence;
}
public final class kotlin/coroutines/experimental/intrinsics/IntrinsicsKt {
public static final fun getSUSPENDED_MARKER ()Ljava/lang/Object;
}
@@ -3362,13 +3373,6 @@ public abstract interface class kotlin/sequences/Sequence {
public abstract fun iterator ()Ljava/util/Iterator;
}
public abstract class kotlin/sequences/SequenceBuilder {
public abstract fun yield (Ljava/lang/Object;Lkotlin/coroutines/experimental/Continuation;)Ljava/lang/Object;
public final fun yieldAll (Ljava/lang/Iterable;Lkotlin/coroutines/experimental/Continuation;)Ljava/lang/Object;
public abstract fun yieldAll (Ljava/util/Iterator;Lkotlin/coroutines/experimental/Continuation;)Ljava/lang/Object;
public final fun yieldAll (Lkotlin/sequences/Sequence;Lkotlin/coroutines/experimental/Continuation;)Ljava/lang/Object;
}
public final class kotlin/sequences/SequencesKt {
public static final fun all (Lkotlin/sequences/Sequence;Lkotlin/jvm/functions/Function1;)Z
public static final fun any (Lkotlin/sequences/Sequence;)Z
@@ -3387,7 +3391,6 @@ public final class kotlin/sequences/SequencesKt {
public static final fun averageOfInt (Lkotlin/sequences/Sequence;)D
public static final fun averageOfLong (Lkotlin/sequences/Sequence;)D
public static final fun averageOfShort (Lkotlin/sequences/Sequence;)D
public static final fun buildSequence (Lkotlin/jvm/functions/Function2;)Lkotlin/sequences/Sequence;
public static final fun constrainOnce (Lkotlin/sequences/Sequence;)Lkotlin/sequences/Sequence;
public static final fun contains (Lkotlin/sequences/Sequence;Ljava/lang/Object;)Z
public static final fun count (Lkotlin/sequences/Sequence;)I
libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib.txt
+12 -9
View File
@@ -1424,7 +1424,6 @@ public final class kotlin/collections/CollectionsKt {
public static synthetic fun binarySearch$default (Ljava/util/List;Ljava/lang/Object;Ljava/util/Comparator;IIILjava/lang/Object;)I
public static final fun binarySearchBy (Ljava/util/List;Ljava/lang/Comparable;IILkotlin/jvm/functions/Function1;)I
public static synthetic fun binarySearchBy$default (Ljava/util/List;Ljava/lang/Comparable;IILkotlin/jvm/functions/Function1;ILjava/lang/Object;)I
public static final fun buildIterator (Lkotlin/jvm/functions/Function2;)Ljava/util/Iterator;
public static final fun collectionSizeOrDefault (Ljava/lang/Iterable;I)I
public static final fun collectionSizeOrNull (Ljava/lang/Iterable;)Ljava/lang/Integer;
public static final fun contains (Ljava/lang/Iterable;Ljava/lang/Object;)Z
@@ -1829,6 +1828,18 @@ public final class kotlin/coroutines/experimental/SafeContinuation : kotlin/coro
public final class kotlin/coroutines/experimental/SafeContinuation$Companion {
}
public abstract class kotlin/coroutines/experimental/SequenceBuilder {
public abstract fun yield (Ljava/lang/Object;Lkotlin/coroutines/experimental/Continuation;)Ljava/lang/Object;
public final fun yieldAll (Ljava/lang/Iterable;Lkotlin/coroutines/experimental/Continuation;)Ljava/lang/Object;
public abstract fun yieldAll (Ljava/util/Iterator;Lkotlin/coroutines/experimental/Continuation;)Ljava/lang/Object;
public final fun yieldAll (Lkotlin/sequences/Sequence;Lkotlin/coroutines/experimental/Continuation;)Ljava/lang/Object;
}
public final class kotlin/coroutines/experimental/SequenceBuilderKt {
public static final fun buildIterator (Lkotlin/jvm/functions/Function2;)Ljava/util/Iterator;
public static final fun buildSequence (Lkotlin/jvm/functions/Function2;)Lkotlin/sequences/Sequence;
}
public final class kotlin/coroutines/experimental/intrinsics/IntrinsicsKt {
public static final fun getSUSPENDED_MARKER ()Ljava/lang/Object;
}
@@ -2120,13 +2131,6 @@ public abstract interface class kotlin/sequences/Sequence {
public abstract fun iterator ()Ljava/util/Iterator;
}
public abstract class kotlin/sequences/SequenceBuilder {
public abstract fun yield (Ljava/lang/Object;Lkotlin/coroutines/experimental/Continuation;)Ljava/lang/Object;
public final fun yieldAll (Ljava/lang/Iterable;Lkotlin/coroutines/experimental/Continuation;)Ljava/lang/Object;
public abstract fun yieldAll (Ljava/util/Iterator;Lkotlin/coroutines/experimental/Continuation;)Ljava/lang/Object;
public final fun yieldAll (Lkotlin/sequences/Sequence;Lkotlin/coroutines/experimental/Continuation;)Ljava/lang/Object;
}
public final class kotlin/sequences/SequencesKt {
public static final fun all (Lkotlin/sequences/Sequence;Lkotlin/jvm/functions/Function1;)Z
public static final fun any (Lkotlin/sequences/Sequence;)Z
@@ -2145,7 +2149,6 @@ public final class kotlin/sequences/SequencesKt {
public static final fun averageOfInt (Lkotlin/sequences/Sequence;)D
public static final fun averageOfLong (Lkotlin/sequences/Sequence;)D
public static final fun averageOfShort (Lkotlin/sequences/Sequence;)D
public static final fun buildSequence (Lkotlin/jvm/functions/Function2;)Lkotlin/sequences/Sequence;
public static final fun constrainOnce (Lkotlin/sequences/Sequence;)Lkotlin/sequences/Sequence;
public static final fun contains (Lkotlin/sequences/Sequence;Ljava/lang/Object;)Z
public static final fun count (Lkotlin/sequences/Sequence;)I