Minor: fix extra space in return type of chunked and windowed

This commit is contained in:
Ilya Gorbunov
2017-11-09 04:14:26 +03:00
parent cf2e9c7002
commit dcd0a94d76
4 changed files with 16 additions and 16 deletions
@@ -1145,7 +1145,7 @@ public fun <R> CharSequence.chunked(size: Int, transform: (CharSequence) -> R):
* @sample samples.collections.Collections.Transformations.chunked * @sample samples.collections.Collections.Transformations.chunked
*/ */
@SinceKotlin("1.2") @SinceKotlin("1.2")
public fun CharSequence.chunkedSequence(size: Int): Sequence<String> { public fun CharSequence.chunkedSequence(size: Int): Sequence<String> {
return chunkedSequence(size) { it.toString() } return chunkedSequence(size) { it.toString() }
} }
@@ -1164,7 +1164,7 @@ public fun CharSequence.chunkedSequence(size: Int): Sequence<String> {
* @sample samples.text.Strings.chunkedTransformToSequence * @sample samples.text.Strings.chunkedTransformToSequence
*/ */
@SinceKotlin("1.2") @SinceKotlin("1.2")
public fun <R> CharSequence.chunkedSequence(size: Int, transform: (CharSequence) -> R): Sequence<R> { public fun <R> CharSequence.chunkedSequence(size: Int, transform: (CharSequence) -> R): Sequence<R> {
return windowedSequence(size, size, partialWindows = true, transform = transform) return windowedSequence(size, size, partialWindows = true, transform = transform)
} }
@@ -1272,7 +1272,7 @@ public fun <R> CharSequence.windowed(size: Int, step: Int = 1, partialWindows: B
* @sample samples.collections.Sequences.Transformations.takeWindows * @sample samples.collections.Sequences.Transformations.takeWindows
*/ */
@SinceKotlin("1.2") @SinceKotlin("1.2")
public fun CharSequence.windowedSequence(size: Int, step: Int = 1, partialWindows: Boolean = false): Sequence<String> { public fun CharSequence.windowedSequence(size: Int, step: Int = 1, partialWindows: Boolean = false): Sequence<String> {
return windowedSequence(size, step, partialWindows) { it.toString() } return windowedSequence(size, step, partialWindows) { it.toString() }
} }
@@ -1294,7 +1294,7 @@ public fun CharSequence.windowedSequence(size: Int, step: Int = 1, partialWindow
* @sample samples.collections.Sequences.Transformations.averageWindows * @sample samples.collections.Sequences.Transformations.averageWindows
*/ */
@SinceKotlin("1.2") @SinceKotlin("1.2")
public fun <R> CharSequence.windowedSequence(size: Int, step: Int = 1, partialWindows: Boolean = false, transform: (CharSequence) -> R): Sequence<R> { public fun <R> CharSequence.windowedSequence(size: Int, step: Int = 1, partialWindows: Boolean = false, transform: (CharSequence) -> R): Sequence<R> {
checkWindowSizeStep(size, step) checkWindowSizeStep(size, step)
val windows = (if (partialWindows) indices else 0 until length - size + 1) step step val windows = (if (partialWindows) indices else 0 until length - size + 1) step step
return windows.asSequence().map { index -> transform(subSequence(index, (index + size).coerceAtMost(length))) } return windows.asSequence().map { index -> transform(subSequence(index, (index + size).coerceAtMost(length))) }
@@ -778,7 +778,7 @@ public fun <R> CharSequence.windowed(size: Int, step: Int = 1, partialWindows: B
* @sample samples.collections.Sequences.Transformations.takeWindows * @sample samples.collections.Sequences.Transformations.takeWindows
*/ */
@SinceKotlin("1.2") @SinceKotlin("1.2")
public fun CharSequence.windowedSequence(size: Int, step: Int = 1, partialWindows: Boolean = false): Sequence<String> { public fun CharSequence.windowedSequence(size: Int, step: Int = 1, partialWindows: Boolean = false): Sequence<String> {
return windowedSequence(size, step, partialWindows) { it.toString() } return windowedSequence(size, step, partialWindows) { it.toString() }
} }
@@ -800,7 +800,7 @@ public fun CharSequence.windowedSequence(size: Int, step: Int = 1, partialWindow
* @sample samples.collections.Sequences.Transformations.averageWindows * @sample samples.collections.Sequences.Transformations.averageWindows
*/ */
@SinceKotlin("1.2") @SinceKotlin("1.2")
public fun <R> CharSequence.windowedSequence(size: Int, step: Int = 1, partialWindows: Boolean = false, transform: (CharSequence) -> R): Sequence<R> { public fun <R> CharSequence.windowedSequence(size: Int, step: Int = 1, partialWindows: Boolean = false, transform: (CharSequence) -> R): Sequence<R> {
checkWindowSizeStep(size, step) checkWindowSizeStep(size, step)
val windows = (if (partialWindows) indices else 0 until length - size + 1) step step val windows = (if (partialWindows) indices else 0 until length - size + 1) step step
return windows.asSequence().map { index -> transform(subSequence(index, (index + size).coerceAtMost(length))) } return windows.asSequence().map { index -> transform(subSequence(index, (index + size).coerceAtMost(length))) }
+4 -4
View File
@@ -1153,7 +1153,7 @@ public fun <R> CharSequence.chunked(size: Int, transform: (CharSequence) -> R):
* @sample samples.collections.Collections.Transformations.chunked * @sample samples.collections.Collections.Transformations.chunked
*/ */
@SinceKotlin("1.2") @SinceKotlin("1.2")
public fun CharSequence.chunkedSequence(size: Int): Sequence<String> { public fun CharSequence.chunkedSequence(size: Int): Sequence<String> {
return chunkedSequence(size) { it.toString() } return chunkedSequence(size) { it.toString() }
} }
@@ -1172,7 +1172,7 @@ public fun CharSequence.chunkedSequence(size: Int): Sequence<String> {
* @sample samples.text.Strings.chunkedTransformToSequence * @sample samples.text.Strings.chunkedTransformToSequence
*/ */
@SinceKotlin("1.2") @SinceKotlin("1.2")
public fun <R> CharSequence.chunkedSequence(size: Int, transform: (CharSequence) -> R): Sequence<R> { public fun <R> CharSequence.chunkedSequence(size: Int, transform: (CharSequence) -> R): Sequence<R> {
return windowedSequence(size, size, partialWindows = true, transform = transform) return windowedSequence(size, size, partialWindows = true, transform = transform)
} }
@@ -1280,7 +1280,7 @@ public fun <R> CharSequence.windowed(size: Int, step: Int = 1, partialWindows: B
* @sample samples.collections.Sequences.Transformations.takeWindows * @sample samples.collections.Sequences.Transformations.takeWindows
*/ */
@SinceKotlin("1.2") @SinceKotlin("1.2")
public fun CharSequence.windowedSequence(size: Int, step: Int = 1, partialWindows: Boolean = false): Sequence<String> { public fun CharSequence.windowedSequence(size: Int, step: Int = 1, partialWindows: Boolean = false): Sequence<String> {
return windowedSequence(size, step, partialWindows) { it.toString() } return windowedSequence(size, step, partialWindows) { it.toString() }
} }
@@ -1302,7 +1302,7 @@ public fun CharSequence.windowedSequence(size: Int, step: Int = 1, partialWindow
* @sample samples.collections.Sequences.Transformations.averageWindows * @sample samples.collections.Sequences.Transformations.averageWindows
*/ */
@SinceKotlin("1.2") @SinceKotlin("1.2")
public fun <R> CharSequence.windowedSequence(size: Int, step: Int = 1, partialWindows: Boolean = false, transform: (CharSequence) -> R): Sequence<R> { public fun <R> CharSequence.windowedSequence(size: Int, step: Int = 1, partialWindows: Boolean = false, transform: (CharSequence) -> R): Sequence<R> {
checkWindowSizeStep(size, step) checkWindowSizeStep(size, step)
val windows = (if (partialWindows) indices else 0 until length - size + 1) step step val windows = (if (partialWindows) indices else 0 until length - size + 1) step step
return windows.asSequence().map { index -> transform(subSequence(index, (index + size).coerceAtMost(length))) } return windows.asSequence().map { index -> transform(subSequence(index, (index + size).coerceAtMost(length))) }
@@ -712,7 +712,7 @@ fun generators(): List<GenericFunction> {
""" """
} }
typeParam("R") typeParam("R")
returns { "Sequence<R> "} returns { "Sequence<R>" }
body { body {
""" """
@@ -743,7 +743,7 @@ fun generators(): List<GenericFunction> {
@sample samples.collections.Sequences.Transformations.takeWindows @sample samples.collections.Sequences.Transformations.takeWindows
""" """
} }
returns { "Sequence<String> "} returns { "Sequence<String>" }
body(CharSequences) { "return windowedSequence(size, step, partialWindows) { it.toString() }" } body(CharSequences) { "return windowedSequence(size, step, partialWindows) { it.toString() }" }
} }
@@ -822,7 +822,7 @@ fun generators(): List<GenericFunction> {
} }
typeParam("R") typeParam("R")
returns { "Sequence<R> "} returns { "Sequence<R>" }
body { body {
""" """
@@ -845,7 +845,7 @@ fun generators(): List<GenericFunction> {
@sample samples.collections.Collections.Transformations.chunked @sample samples.collections.Collections.Transformations.chunked
""" """
} }
returns { "Sequence<String> "} returns { "Sequence<String>" }
body(CharSequences) { "return chunkedSequence(size) { it.toString() }" } body(CharSequences) { "return chunkedSequence(size) { it.toString() }" }
} }