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

Generate 'chunked' and 'windowed' signatures and delegating implementations

Browse Source 
Add implementations of windowed.
This commit is contained in:
Ilya Gorbunov
2017-04-27 16:35:05 +03:00
parent 6ae85f5108
commit a3a1c391cc
13 changed files with 351 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib-runtime-merged.txt
+16
View File
@@ -1565,6 +1565,8 @@ 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 chunked (Ljava/lang/Iterable;I)Ljava/util/List;
public static final fun chunked (Ljava/lang/Iterable;ILkotlin/jvm/functions/Function1;)Ljava/util/List;
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
@@ -1745,6 +1747,8 @@ public final class kotlin/collections/CollectionsKt {
public static final fun toSortedSet (Ljava/lang/Iterable;Ljava/util/Comparator;)Ljava/util/SortedSet;
public static final fun union (Ljava/lang/Iterable;Ljava/lang/Iterable;)Ljava/util/Set;
public static final fun unzip (Ljava/lang/Iterable;)Lkotlin/Pair;
public static final fun windowed (Ljava/lang/Iterable;II)Ljava/util/List;
public static final fun windowed (Ljava/lang/Iterable;IILkotlin/jvm/functions/Function1;)Ljava/util/List;
public static final fun withIndex (Ljava/lang/Iterable;)Ljava/lang/Iterable;
public static final fun withIndex (Ljava/util/Iterator;)Ljava/util/Iterator;
public static final fun zip (Ljava/lang/Iterable;Ljava/lang/Iterable;)Ljava/util/List;
@@ -3474,6 +3478,8 @@ 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 chunked (Lkotlin/sequences/Sequence;I)Lkotlin/sequences/Sequence;
public static final fun chunked (Lkotlin/sequences/Sequence;ILkotlin/jvm/functions/Function1;)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
@@ -3592,6 +3598,8 @@ public final class kotlin/sequences/SequencesKt {
public static final fun toSortedSet (Lkotlin/sequences/Sequence;)Ljava/util/SortedSet;
public static final fun toSortedSet (Lkotlin/sequences/Sequence;Ljava/util/Comparator;)Ljava/util/SortedSet;
public static final fun unzip (Lkotlin/sequences/Sequence;)Lkotlin/Pair;
public static final fun windowed (Lkotlin/sequences/Sequence;II)Lkotlin/sequences/Sequence;
public static final fun windowed (Lkotlin/sequences/Sequence;IILkotlin/jvm/functions/Function1;)Lkotlin/sequences/Sequence;
public static final fun withIndex (Lkotlin/sequences/Sequence;)Lkotlin/sequences/Sequence;
public static final fun zip (Lkotlin/sequences/Sequence;Lkotlin/sequences/Sequence;)Lkotlin/sequences/Sequence;
public static final fun zip (Lkotlin/sequences/Sequence;Lkotlin/sequences/Sequence;Lkotlin/jvm/functions/Function2;)Lkotlin/sequences/Sequence;
@@ -3800,6 +3808,10 @@ public final class kotlin/text/StringsKt {
public static final fun associateByTo (Ljava/lang/CharSequence;Ljava/util/Map;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;)Ljava/util/Map;
public static final fun associateTo (Ljava/lang/CharSequence;Ljava/util/Map;Lkotlin/jvm/functions/Function1;)Ljava/util/Map;
public static final fun capitalize (Ljava/lang/String;)Ljava/lang/String;
public static final fun chunked (Ljava/lang/CharSequence;I)Ljava/util/List;
public static final fun chunked (Ljava/lang/CharSequence;ILkotlin/jvm/functions/Function1;)Ljava/util/List;
public static final fun chunkedSequence (Ljava/lang/CharSequence;I)Lkotlin/sequences/Sequence;
public static final fun chunkedSequence (Ljava/lang/CharSequence;ILkotlin/jvm/functions/Function1;)Lkotlin/sequences/Sequence;
public static final fun commonPrefixWith (Ljava/lang/CharSequence;Ljava/lang/CharSequence;Z)Ljava/lang/String;
public static synthetic fun commonPrefixWith$default (Ljava/lang/CharSequence;Ljava/lang/CharSequence;ZILjava/lang/Object;)Ljava/lang/String;
public static final fun commonSuffixWith (Ljava/lang/CharSequence;Ljava/lang/CharSequence;Z)Ljava/lang/String;
@@ -4060,6 +4072,10 @@ public final class kotlin/text/StringsKt {
public static final fun trimStart (Ljava/lang/CharSequence;[C)Ljava/lang/CharSequence;
public static final fun trimStart (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Ljava/lang/String;
public static final fun trimStart (Ljava/lang/String;[C)Ljava/lang/String;
public static final fun windowed (Ljava/lang/CharSequence;II)Ljava/util/List;
public static final fun windowed (Ljava/lang/CharSequence;IILkotlin/jvm/functions/Function1;)Ljava/util/List;
public static final fun windowedSequence (Ljava/lang/CharSequence;II)Lkotlin/sequences/Sequence;
public static final fun windowedSequence (Ljava/lang/CharSequence;IILkotlin/jvm/functions/Function1;)Lkotlin/sequences/Sequence;
public static final fun withIndex (Ljava/lang/CharSequence;)Ljava/lang/Iterable;
public static final fun zip (Ljava/lang/CharSequence;Ljava/lang/CharSequence;)Ljava/util/List;
public static final fun zip (Ljava/lang/CharSequence;Ljava/lang/CharSequence;Lkotlin/jvm/functions/Function2;)Ljava/util/List;
libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib.txt
+16
View File
@@ -1424,6 +1424,8 @@ 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 chunked (Ljava/lang/Iterable;I)Ljava/util/List;
public static final fun chunked (Ljava/lang/Iterable;ILkotlin/jvm/functions/Function1;)Ljava/util/List;
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
@@ -1604,6 +1606,8 @@ public final class kotlin/collections/CollectionsKt {
public static final fun toSortedSet (Ljava/lang/Iterable;Ljava/util/Comparator;)Ljava/util/SortedSet;
public static final fun union (Ljava/lang/Iterable;Ljava/lang/Iterable;)Ljava/util/Set;
public static final fun unzip (Ljava/lang/Iterable;)Lkotlin/Pair;
public static final fun windowed (Ljava/lang/Iterable;II)Ljava/util/List;
public static final fun windowed (Ljava/lang/Iterable;IILkotlin/jvm/functions/Function1;)Ljava/util/List;
public static final fun withIndex (Ljava/lang/Iterable;)Ljava/lang/Iterable;
public static final fun withIndex (Ljava/util/Iterator;)Ljava/util/Iterator;
public static final fun zip (Ljava/lang/Iterable;Ljava/lang/Iterable;)Ljava/util/List;
@@ -2169,6 +2173,8 @@ 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 chunked (Lkotlin/sequences/Sequence;I)Lkotlin/sequences/Sequence;
public static final fun chunked (Lkotlin/sequences/Sequence;ILkotlin/jvm/functions/Function1;)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
@@ -2287,6 +2293,8 @@ public final class kotlin/sequences/SequencesKt {
public static final fun toSortedSet (Lkotlin/sequences/Sequence;)Ljava/util/SortedSet;
public static final fun toSortedSet (Lkotlin/sequences/Sequence;Ljava/util/Comparator;)Ljava/util/SortedSet;
public static final fun unzip (Lkotlin/sequences/Sequence;)Lkotlin/Pair;
public static final fun windowed (Lkotlin/sequences/Sequence;II)Lkotlin/sequences/Sequence;
public static final fun windowed (Lkotlin/sequences/Sequence;IILkotlin/jvm/functions/Function1;)Lkotlin/sequences/Sequence;
public static final fun withIndex (Lkotlin/sequences/Sequence;)Lkotlin/sequences/Sequence;
public static final fun zip (Lkotlin/sequences/Sequence;Lkotlin/sequences/Sequence;)Lkotlin/sequences/Sequence;
public static final fun zip (Lkotlin/sequences/Sequence;Lkotlin/sequences/Sequence;Lkotlin/jvm/functions/Function2;)Lkotlin/sequences/Sequence;
@@ -2495,6 +2503,10 @@ public final class kotlin/text/StringsKt {
public static final fun associateByTo (Ljava/lang/CharSequence;Ljava/util/Map;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;)Ljava/util/Map;
public static final fun associateTo (Ljava/lang/CharSequence;Ljava/util/Map;Lkotlin/jvm/functions/Function1;)Ljava/util/Map;
public static final fun capitalize (Ljava/lang/String;)Ljava/lang/String;
public static final fun chunked (Ljava/lang/CharSequence;I)Ljava/util/List;
public static final fun chunked (Ljava/lang/CharSequence;ILkotlin/jvm/functions/Function1;)Ljava/util/List;
public static final fun chunkedSequence (Ljava/lang/CharSequence;I)Lkotlin/sequences/Sequence;
public static final fun chunkedSequence (Ljava/lang/CharSequence;ILkotlin/jvm/functions/Function1;)Lkotlin/sequences/Sequence;
public static final fun commonPrefixWith (Ljava/lang/CharSequence;Ljava/lang/CharSequence;Z)Ljava/lang/String;
public static synthetic fun commonPrefixWith$default (Ljava/lang/CharSequence;Ljava/lang/CharSequence;ZILjava/lang/Object;)Ljava/lang/String;
public static final fun commonSuffixWith (Ljava/lang/CharSequence;Ljava/lang/CharSequence;Z)Ljava/lang/String;
@@ -2755,6 +2767,10 @@ public final class kotlin/text/StringsKt {
public static final fun trimStart (Ljava/lang/CharSequence;[C)Ljava/lang/CharSequence;
public static final fun trimStart (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Ljava/lang/String;
public static final fun trimStart (Ljava/lang/String;[C)Ljava/lang/String;
public static final fun windowed (Ljava/lang/CharSequence;II)Ljava/util/List;
public static final fun windowed (Ljava/lang/CharSequence;IILkotlin/jvm/functions/Function1;)Ljava/util/List;
public static final fun windowedSequence (Ljava/lang/CharSequence;II)Lkotlin/sequences/Sequence;
public static final fun windowedSequence (Ljava/lang/CharSequence;IILkotlin/jvm/functions/Function1;)Lkotlin/sequences/Sequence;
public static final fun withIndex (Ljava/lang/CharSequence;)Ljava/lang/Iterable;
public static final fun zip (Ljava/lang/CharSequence;Ljava/lang/CharSequence;)Ljava/util/List;
public static final fun zip (Ljava/lang/CharSequence;Ljava/lang/CharSequence;Lkotlin/jvm/functions/Function2;)Ljava/util/List;
libraries/tools/kotlin-stdlib-gen/src/templates/Generators.kt
+104
View File
@@ -559,6 +559,110 @@ fun generators(): List<GenericFunction> {
}
}
templates add f("windowed(size: Int, step: Int, transform: (List<T>) -> R)") {
since("1.2")
only(Iterables, Sequences, CharSequences)
typeParam("R")
returns("List<R>")
body {
"""
if (this is List) {
return windowIndices(this.size, size, step, dropTrailing = false).asIterable().map { transform(subList(it.start, it.endInclusive + 1)) }
}
return windowForwardOnlySequenceImpl(iterator(), size, step, dropTrailing = false).asIterable().map(transform)
"""
}
customSignature(CharSequences) { "windowed(size: Int, step: Int, transform: (CharSequence) -> R)" }
body(CharSequences) {
"""
return windowIndices(this.length, size, step, dropTrailing = false).asIterable().map { transform(subSequence(it)) }
"""
}
returns(Sequences) { "Sequence<R>" }
body(Sequences) {
"""
return Sequence { windowForwardOnlySequenceImpl(iterator(), size, step, dropTrailing = false).iterator() }.map(transform)
"""
}
}
templates add f("windowed(size: Int, step: Int)") {
since("1.2")
only(Iterables, Sequences, CharSequences)
returns(Iterables) { "List<List<T>>" }
returns(Sequences) { "Sequence<List<T>>" }
returns(CharSequences) { "List<String>" }
body { "return windowed(size, step) { it.toList() }" }
body(CharSequences) { "return windowed(size, step) { it.toString() }" }
}
templates add f("windowedSequence(size: Int, step: Int, transform: (CharSequence) -> R)") {
since("1.2")
only(CharSequences)
typeParam("R")
returns { "Sequence<R> "}
body(CharSequences) {
"""
return windowIndices(this.length, size, step, dropTrailing = false).map { transform(subSequence(it)) }
"""
}
}
templates add f("windowedSequence(size: Int, step: Int)") {
since("1.2")
only(CharSequences)
returns { "Sequence<String> "}
body(CharSequences) { "return windowedSequence(size, step) { it.toString() }" }
}
templates add f("chunked(size: Int, transform: (List<T>) -> R)") {
since("1.2")
only(Iterables, Sequences, CharSequences)
typeParam("R")
returns("List<R>")
customSignature(CharSequences) { "chunked(size: Int, transform: (CharSequence) -> R)" }
returns(Sequences) { "Sequence<R>" }
body { "return windowed(size, size, transform)" }
}
templates add f("chunked(size: Int)") {
since("1.2")
only(Iterables, Sequences, CharSequences)
returns(Iterables) { "List<List<T>>" }
returns(Sequences) { "Sequence<List<T>>" }
returns(CharSequences) { "List<String>" }
body { "return chunked(size) { it.toList() }" }
body(CharSequences) { "return chunked(size) { it.toString() }" }
}
templates add f("chunkedSequence(size: Int, transform: (CharSequence) -> R)") {
since("1.2")
only(CharSequences)
typeParam("R")
returns { "Sequence<R> "}
body { "return windowedSequence(size, size, transform)" }
}
templates add f("chunkedSequence(size: Int)") {
since("1.2")
only(CharSequences)
returns { "Sequence<String> "}
body(CharSequences) { "return chunkedSequence(size) { it.toString() }" }
}
templates add f("pairwise(transform: (a: T, b: T) -> R)") {
since("1.2")
only(Iterables, Sequences, CharSequences)