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

Rename pairwise to zipWithNext, KEEP-11

Browse Source
This commit is contained in:
Ilya Gorbunov
2017-07-26 23:39:33 +03:00
parent c2cee2e405
commit c04b0072af
16 changed files with 374 additions and 239 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
+6
View File
@@ -1757,6 +1757,8 @@ public final class kotlin/collections/CollectionsKt {
public static final fun zip (Ljava/lang/Iterable;Ljava/lang/Iterable;Lkotlin/jvm/functions/Function2;)Ljava/util/List;
public static final fun zip (Ljava/lang/Iterable;[Ljava/lang/Object;)Ljava/util/List;
public static final fun zip (Ljava/lang/Iterable;[Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/util/List;
public static final fun zipWithNext (Ljava/lang/Iterable;)Ljava/util/List;
public static final fun zipWithNext (Ljava/lang/Iterable;Lkotlin/jvm/functions/Function2;)Ljava/util/List;
}
public abstract class kotlin/collections/DoubleIterator : java/util/Iterator, kotlin/jvm/internal/markers/KMappedMarker {
@@ -3605,6 +3607,8 @@ public final class kotlin/sequences/SequencesKt {
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;
public static final fun zipWithNext (Lkotlin/sequences/Sequence;)Lkotlin/sequences/Sequence;
public static final fun zipWithNext (Lkotlin/sequences/Sequence;Lkotlin/jvm/functions/Function2;)Lkotlin/sequences/Sequence;
}
public final class kotlin/system/TimingKt {
@@ -4085,6 +4089,8 @@ public final class kotlin/text/StringsKt {
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;
public static final fun zipWithNext (Ljava/lang/CharSequence;)Ljava/util/List;
public static final fun zipWithNext (Ljava/lang/CharSequence;Lkotlin/jvm/functions/Function2;)Ljava/util/List;
}
public final class kotlin/text/Typography {
libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib.txt
+6
View File
@@ -1616,6 +1616,8 @@ public final class kotlin/collections/CollectionsKt {
public static final fun zip (Ljava/lang/Iterable;Ljava/lang/Iterable;Lkotlin/jvm/functions/Function2;)Ljava/util/List;
public static final fun zip (Ljava/lang/Iterable;[Ljava/lang/Object;)Ljava/util/List;
public static final fun zip (Ljava/lang/Iterable;[Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/util/List;
public static final fun zipWithNext (Ljava/lang/Iterable;)Ljava/util/List;
public static final fun zipWithNext (Ljava/lang/Iterable;Lkotlin/jvm/functions/Function2;)Ljava/util/List;
}
public abstract interface class kotlin/collections/Grouping {
@@ -2300,6 +2302,8 @@ public final class kotlin/sequences/SequencesKt {
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;
public static final fun zipWithNext (Lkotlin/sequences/Sequence;)Lkotlin/sequences/Sequence;
public static final fun zipWithNext (Lkotlin/sequences/Sequence;Lkotlin/jvm/functions/Function2;)Lkotlin/sequences/Sequence;
}
public final class kotlin/system/TimingKt {
@@ -2780,6 +2784,8 @@ public final class kotlin/text/StringsKt {
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;
public static final fun zipWithNext (Ljava/lang/CharSequence;)Ljava/util/List;
public static final fun zipWithNext (Ljava/lang/CharSequence;Lkotlin/jvm/functions/Function2;)Ljava/util/List;
}
public final class kotlin/text/Typography {
libraries/tools/kotlin-stdlib-gen/src/templates/Generators.kt
+30 -3
View File
@@ -837,6 +837,22 @@ fun generators(): List<GenericFunction> {
}
templates add f("pairwise(transform: (a: T, b: T) -> R)") {
deprecate(Deprecation("Use zipWithNext instead", "zipWithNext(transform)"))
since("1.2")
only(Iterables, Sequences, CharSequences)
typeParam("R")
returns("List<R>")
inline(true)
body {
"""
return zipWithNext(transform)
"""
}
inline(false, Sequences)
returns(Sequences) { "Sequence<R>" }
}
templates add f("zipWithNext(transform: (a: T, b: T) -> R)") {
since("1.2")
only(Iterables, Sequences, CharSequences)
typeParam("R")
@@ -847,7 +863,7 @@ fun generators(): List<GenericFunction> {
The returned ${f.mapResult} is empty if this ${f.collection} contains less than two ${f.element.pluralize()}.
@sample samples.collections.Collections.Transformations.pairwiseToFindDeltas
@sample samples.collections.Collections.Transformations.zipWithNextToFindDeltas
"""
}
returns("List<R>")
@@ -898,6 +914,17 @@ fun generators(): List<GenericFunction> {
}
templates add f("pairwise()") {
deprecate(Deprecation("Use zipWithNext instead", "zipWithNext()"))
since("1.2")
only(Iterables, Sequences, CharSequences)
returns("List<Pair<T, T>>")
returns(Sequences) { "Sequence<Pair<T, T>>" }
body {
"return zipWithNext { a, b -> a to b }"
}
}
templates add f("zipWithNext()") {
since("1.2")
only(Iterables, Sequences, CharSequences)
returns("List<Pair<T, T>>")
@@ -907,13 +934,13 @@ fun generators(): List<GenericFunction> {
The returned ${f.mapResult} is empty if this ${f.collection} contains less than two ${f.element.pluralize()}.
@sample samples.collections.Collections.Transformations.pairwise
@sample samples.collections.Collections.Transformations.zipWithNext
"""
}
sequenceClassification(intermediate, stateless)
returns(Sequences) { "Sequence<Pair<T, T>>" }
body {
"return pairwise { a, b -> a to b }"
"return zipWithNext { a, b -> a to b }"
}
}