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

Generalize String extensions to take CharSequence as receiver and parameters where applicable: generated code.

Browse Source 
Exclude Strings family from default families.
This commit is contained in:
Ilya Gorbunov
2015-10-12 14:59:37 +03:00
parent 4a621cbb5f
commit 935e606b64
11 changed files with 258 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-stdlib-gen/src/templates/Aggregates.kt
+23 -18
View File
@@ -15,7 +15,7 @@ fun aggregates(): List<GenericFunction> {
return true
"""
}
include(Maps)
include(Maps, CharSequences)
}
templates add f("none(predicate: (T) -> Boolean)") {
@@ -29,7 +29,7 @@ fun aggregates(): List<GenericFunction> {
return true
"""
}
include(Maps)
include(Maps, CharSequences)
}
templates add f("none()") {
@@ -41,7 +41,7 @@ fun aggregates(): List<GenericFunction> {
return true
"""
}
include(Maps)
include(Maps, CharSequences)
}
templates add f("any(predicate: (T) -> Boolean)") {
@@ -55,7 +55,7 @@ fun aggregates(): List<GenericFunction> {
return false
"""
}
include(Maps)
include(Maps, CharSequences)
}
templates add f("any()") {
@@ -67,7 +67,7 @@ fun aggregates(): List<GenericFunction> {
return false
"""
}
include(Maps)
include(Maps, CharSequences)
}
templates add f("count(predicate: (T) -> Boolean)") {
@@ -82,7 +82,7 @@ fun aggregates(): List<GenericFunction> {
return count
"""
}
include(Maps)
include(Maps, CharSequences)
}
templates add f("count()") {
@@ -95,8 +95,8 @@ fun aggregates(): List<GenericFunction> {
return count
"""
}
doc(Strings) { "Returns the length of this string."}
body(Strings) {
doc(CharSequences) { "Returns the length of this string."}
body(CharSequences) {
"return length()"
}
body(Maps, Collections, ArraysOfObjects, ArraysOfPrimitives) {
@@ -106,8 +106,9 @@ fun aggregates(): List<GenericFunction> {
templates add f("sumBy(transform: (T) -> Int)") {
inline(true)
include(CharSequences)
doc { "Returns the sum of all values produced by [transform] function from elements in the collection." }
doc(Strings) { "Returns the sum of all values produced by [transform] function from characters in the string." }
doc(CharSequences) { "Returns the sum of all values produced by [transform] function from characters in the string." }
returns("Int")
body {
"""
@@ -122,8 +123,9 @@ fun aggregates(): List<GenericFunction> {
templates add f("sumByDouble(transform: (T) -> Double)") {
inline(true)
include(CharSequences)
doc { "Returns the sum of all values produced by [transform] function from elements in the collection." }
doc(Strings) { "Returns the sum of all values produced by [transform] function from characters in the string." }
doc(CharSequences) { "Returns the sum of all values produced by [transform] function from characters in the string." }
returns("Double")
body {
"""
@@ -154,7 +156,7 @@ fun aggregates(): List<GenericFunction> {
return min
"""
}
body(ArraysOfObjects, ArraysOfPrimitives) {
body(CharSequences, ArraysOfObjects, ArraysOfPrimitives) {
"""
if (isEmpty()) return null
var min = this[0]
@@ -192,9 +194,9 @@ fun aggregates(): List<GenericFunction> {
return minElem
"""
}
body(ArraysOfObjects, ArraysOfPrimitives) {
body(CharSequences, ArraysOfObjects, ArraysOfPrimitives) {
"""
if (size() == 0) return null
if (isEmpty()) return null
var minElem = this[0]
var minValue = f(minElem)
@@ -257,7 +259,7 @@ fun aggregates(): List<GenericFunction> {
"""
}
body(ArraysOfObjects, ArraysOfPrimitives) {
body(CharSequences, ArraysOfObjects, ArraysOfPrimitives) {
"""
if (isEmpty()) return null
@@ -296,7 +298,7 @@ fun aggregates(): List<GenericFunction> {
return maxElem
"""
}
body(ArraysOfObjects, ArraysOfPrimitives) {
body(CharSequences, ArraysOfObjects, ArraysOfPrimitives) {
"""
if (isEmpty()) return null
@@ -345,6 +347,7 @@ fun aggregates(): List<GenericFunction> {
templates add f("fold(initial: R, operation: (R, T) -> R)") {
inline(true)
include(CharSequences)
doc { "Accumulates value starting with [initial] value and applying [operation] from left to right to current accumulator value and each element." }
typeParam("R")
returns("R")
@@ -360,7 +363,7 @@ fun aggregates(): List<GenericFunction> {
templates add f("foldRight(initial: R, operation: (T, R) -> R)") {
inline(true)
only(Strings, Lists, ArraysOfObjects, ArraysOfPrimitives)
only(CharSequences, Lists, ArraysOfObjects, ArraysOfPrimitives)
doc { "Accumulates value starting with [initial] value and applying [operation] from right to left to each element and current accumulator value." }
typeParam("R")
returns("R")
@@ -379,6 +382,7 @@ fun aggregates(): List<GenericFunction> {
templates add f("reduce(operation: (T, T) -> T)") {
inline(true)
include(CharSequences)
exclude(ArraysOfObjects, Iterables, Sequences)
doc { "Accumulates value starting with the first element and applying [operation] from left to right to current accumulator value and each element." }
@@ -422,7 +426,7 @@ fun aggregates(): List<GenericFunction> {
templates add f("reduceRight(operation: (T, T) -> T)") {
inline(true)
only(Strings, ArraysOfPrimitives)
only(CharSequences, ArraysOfPrimitives)
doc { "Accumulates value starting with last element and applying [operation] from right to left to each element and current accumulator value." }
returns("T")
body {
@@ -473,11 +477,12 @@ fun aggregates(): List<GenericFunction> {
for (element in this) operation(element)
"""
}
include(Maps)
include(Maps, CharSequences)
}
templates add f("forEachIndexed(operation: (Int, T) -> Unit)") {
inline(true)
include(CharSequences)
doc { "Performs the given [operation] on each element, providing sequential index with the element." }
returns("Unit")
body {
libraries/tools/kotlin-stdlib-gen/src/templates/Elements.kt
+38 -30
View File
@@ -224,7 +224,7 @@ fun elements(): List<GenericFunction> {
"""
}
body(Lists, Strings, ArraysOfPrimitives, ArraysOfObjects) {
body(Lists, CharSequences, ArraysOfPrimitives, ArraysOfObjects) {
"""
for (index in indices) {
if (predicate(this[index])) {
@@ -254,7 +254,7 @@ fun elements(): List<GenericFunction> {
"""
}
body(Lists, Strings, ArraysOfPrimitives, ArraysOfObjects) {
body(Lists, CharSequences, ArraysOfPrimitives, ArraysOfObjects) {
"""
for (index in indices.reversed()) {
if (predicate(this[index])) {
@@ -283,7 +283,7 @@ fun elements(): List<GenericFunction> {
return elementAtOrElse(index) { throw IndexOutOfBoundsException("Sequence doesn't contain element at index $index.") }
"""
}
body(Strings, Lists, ArraysOfObjects, ArraysOfPrimitives) {
body(CharSequences, Lists, ArraysOfObjects, ArraysOfPrimitives) {
"""
return get(index)
"""
@@ -323,8 +323,8 @@ fun elements(): List<GenericFunction> {
return defaultValue(index)
"""
}
inline(true, Strings, Lists, ArraysOfObjects, ArraysOfPrimitives)
body(Strings, Lists, ArraysOfObjects, ArraysOfPrimitives) {
inline(true, CharSequences, Lists, ArraysOfObjects, ArraysOfPrimitives)
body(CharSequences, Lists, ArraysOfObjects, ArraysOfPrimitives) {
"""
return if (index >= 0 && index <= lastIndex) get(index) else defaultValue(index)
"""
@@ -335,7 +335,7 @@ fun elements(): List<GenericFunction> {
doc { "Returns an element at the given [index] or the result of calling the [defaultValue] function if the [index] is out of bounds of this collection." }
returns("T")
inline(true)
only(Strings, Lists, ArraysOfObjects, ArraysOfPrimitives)
only(CharSequences, Lists, ArraysOfObjects, ArraysOfPrimitives)
body {
"""
return if (index >= 0 && index <= lastIndex) get(index) else defaultValue(index)
@@ -377,7 +377,7 @@ fun elements(): List<GenericFunction> {
return null
"""
}
body(Strings, Lists, ArraysOfObjects, ArraysOfPrimitives) {
body(CharSequences, Lists, ArraysOfObjects, ArraysOfPrimitives) {
"""
return if (index >= 0 && index <= lastIndex) get(index) else null
"""
@@ -387,7 +387,7 @@ fun elements(): List<GenericFunction> {
templates add f("getOrNull(index: Int)") {
doc { "Returns an element at the given [index] or `null` if the [index] is out of bounds of this collection." }
returns("T?")
only(Strings, Lists, ArraysOfObjects, ArraysOfPrimitives)
only(CharSequences, Lists, ArraysOfObjects, ArraysOfPrimitives)
body {
"""
return if (index >= 0 && index <= lastIndex) get(index) else null
@@ -400,8 +400,8 @@ fun elements(): List<GenericFunction> {
doc { """Returns first element.
@throws [NoSuchElementException] if the collection is empty.
""" }
doc(Strings) { """Returns first character.
@throws [NoSuchElementException] if the string is empty.
doc(CharSequences) { """Returns first character.
@throws [NoSuchElementException] if the CharSequence is empty.
""" }
returns("T")
body {
@@ -422,7 +422,7 @@ fun elements(): List<GenericFunction> {
}
"""
}
body(Strings, Lists, ArraysOfObjects, ArraysOfPrimitives) {
body(CharSequences, Lists, ArraysOfObjects, ArraysOfPrimitives) {
"""
if (isEmpty())
throw NoSuchElementException("Collection is empty.")
@@ -440,7 +440,7 @@ fun elements(): List<GenericFunction> {
}
templates add f("firstOrNull()") {
doc { "Returns the first element, or `null` if the collection is empty." }
doc(Strings) { "Returns the first character, or `null` if string is empty." }
doc(CharSequences) { "Returns the first character, or `null` if CharSequence is empty." }
returns("T?")
body {
"""
@@ -460,7 +460,7 @@ fun elements(): List<GenericFunction> {
}
"""
}
body(Strings, Lists, ArraysOfObjects, ArraysOfPrimitives) {
body(CharSequences, Lists, ArraysOfObjects, ArraysOfPrimitives) {
"""
return if (isEmpty()) null else this[0]
"""
@@ -478,9 +478,10 @@ fun elements(): List<GenericFunction> {
templates add f("first(predicate: (T) -> Boolean)") {
inline(true)
include(CharSequences)
doc { """Returns the first element matching the given [predicate].
@throws [NoSuchElementException] if no such element is found.""" }
doc(Strings) { """Returns the first character matching the given [predicate].
doc(CharSequences) { """Returns the first character matching the given [predicate].
@throws [NoSuchElementException] if no such character is found.""" }
returns("T")
body {
@@ -494,8 +495,9 @@ fun elements(): List<GenericFunction> {
templates add f("firstOrNull(predicate: (T) -> Boolean)") {
inline(true)
include(CharSequences)
doc { "Returns the first element matching the given [predicate], or `null` if element was not found." }
doc(Strings) { "Returns the first character matching the given [predicate], or `null` if character was not found." }
doc(CharSequences) { "Returns the first character matching the given [predicate], or `null` if character was not found." }
returns("T?")
body {
"""
@@ -507,8 +509,9 @@ fun elements(): List<GenericFunction> {
templates add f("find(predicate: (T) -> Boolean)") {
inline(true)
include(CharSequences)
doc { "Returns the first element matching the given [predicate], or `null` if element was not found." }
doc(Strings) { "Returns the first character matching the given [predicate], or `null` if character was not found." }
doc(CharSequences) { "Returns the first character matching the given [predicate], or `null` if character was not found." }
returns("T?")
body { "return firstOrNull(predicate)"}
}
@@ -516,7 +519,7 @@ fun elements(): List<GenericFunction> {
templates add f("last()") {
doc { """Returns the last element.
@throws [NoSuchElementException] if the collection is empty.""" }
doc(Strings) { """"Returns the last character.
doc(CharSequences) { """"Returns the last character.
@throws [NoSuchElementException] if the string is empty.""" }
returns("T")
body {
@@ -551,7 +554,7 @@ fun elements(): List<GenericFunction> {
return last
"""
}
body(Strings, Lists, ArraysOfObjects, ArraysOfPrimitives) {
body(CharSequences, Lists, ArraysOfObjects, ArraysOfPrimitives) {
"""
if (isEmpty())
throw NoSuchElementException("Collection is empty.")
@@ -562,7 +565,7 @@ fun elements(): List<GenericFunction> {
templates add f("lastOrNull()") {
doc { "Returns the last element, or `null` if the collection is empty." }
doc(Strings) { "Returns the last character, or `null` if the string is empty." }
doc(CharSequences) { "Returns the last character, or `null` if the string is empty." }
returns("T?")
body {
"""
@@ -591,7 +594,7 @@ fun elements(): List<GenericFunction> {
return last
"""
}
body(Strings) {
body(CharSequences) {
"""
return if (isEmpty()) null else this[length() - 1]
"""
@@ -605,9 +608,11 @@ fun elements(): List<GenericFunction> {
templates add f("last(predicate: (T) -> Boolean)") {
inline(true)
include(CharSequences)
doc { """Returns the last element matching the given [predicate].
@throws [NoSuchElementException] if no such element is found.""" }
doc(Strings) { """"Returns the last character matching the given [predicate].
doc(CharSequences) { """"Returns the last character matching the given [predicate].
@throws [NoSuchElementException] if no such character is found.""" }
returns("T")
body { f ->
@@ -644,8 +649,9 @@ fun elements(): List<GenericFunction> {
templates add f("lastOrNull(predicate: (T) -> Boolean)") {
inline(true)
include(CharSequences)
doc { "Returns the last element matching the given [predicate], or `null` if no such element was found." }
doc(Strings) { "Returns the last character matching the given [predicate], or `null` if no such character was found." }
doc(CharSequences) { "Returns the last character matching the given [predicate], or `null` if no such character was found." }
returns("T?")
body { f ->
(if (f == Iterables)
@@ -678,16 +684,16 @@ fun elements(): List<GenericFunction> {
templates add f("findLast(predicate: (T) -> Boolean)") {
inline(true)
include(Lists)
include(Lists, CharSequences)
doc { "Returns the last element matching the given [predicate], or `null` if no such element was found." }
doc(Strings) { "Returns the last character matching the given [predicate], or `null` if no such character was found." }
doc(CharSequences) { "Returns the last character matching the given [predicate], or `null` if no such character was found." }
returns("T?")
body { "return lastOrNull(predicate)"}
}
templates add f("single()") {
doc { "Returns the single element, or throws an exception if the collection is empty or has more than one element." }
doc(Strings) { "Returns the single character, or throws an exception if the string is empty or has more than one character." }
doc(CharSequences) { "Returns the single character, or throws an exception if the string is empty or has more than one character." }
returns("T")
body {
"""
@@ -720,7 +726,7 @@ fun elements(): List<GenericFunction> {
return single
"""
}
body(Strings) {
body(CharSequences) {
"""
return when (length()) {
0 -> throw NoSuchElementException("Collection is empty.")
@@ -742,7 +748,7 @@ fun elements(): List<GenericFunction> {
templates add f("singleOrNull()") {
doc { "Returns single element, or `null` if the collection is empty or has more than one element." }
doc(Strings) { "Returns the single character, or `null` if the string is empty or has more than one character." }
doc(CharSequences) { "Returns the single character, or `null` if the string is empty or has more than one character." }
returns("T?")
body {
"""
@@ -771,7 +777,7 @@ fun elements(): List<GenericFunction> {
return single
"""
}
body(Strings) {
body(CharSequences) {
"""
return if (length() == 1) this[0] else null
"""
@@ -785,8 +791,9 @@ fun elements(): List<GenericFunction> {
templates add f("single(predicate: (T) -> Boolean)") {
inline(true)
include(CharSequences)
doc { "Returns the single element matching the given [predicate], or throws exception if there is no or more than one matching element." }
doc(Strings) { "Returns the single character matching the given [predicate], or throws exception if there is no or more than one matching character." }
doc(CharSequences) { "Returns the single character matching the given [predicate], or throws exception if there is no or more than one matching character." }
returns("T")
body {
"""
@@ -807,8 +814,9 @@ fun elements(): List<GenericFunction> {
templates add f("singleOrNull(predicate: (T) -> Boolean)") {
inline(true)
include(CharSequences)
doc { "Returns the single element matching the given [predicate], or `null` if element was not found or more than one element was found." }
doc(Strings) { "Returns the single character matching the given [predicate], or `null` if character was not found or more than one character was found." }
doc(CharSequences) { "Returns the single character matching the given [predicate], or `null` if character was not found or more than one character was found." }
returns("T?")
body {
"""
libraries/tools/kotlin-stdlib-gen/src/templates/Engine.kt
+7 -4
View File
@@ -17,6 +17,7 @@ enum class Family {
ArraysOfObjects,
ArraysOfPrimitives,
InvariantArraysOfObjects,
CharSequences,
Strings,
Ranges,
RangesOfPrimitives,
@@ -28,7 +29,7 @@ enum class Family {
companion object {
val primitiveSpecializations = setOf(ArraysOfPrimitives, RangesOfPrimitives, ProgressionsOfPrimitives, Primitives)
val defaultFamilies = setOf(Iterables, Sequences, ArraysOfObjects, ArraysOfPrimitives, Strings)
val defaultFamilies = setOf(Iterables, Sequences, ArraysOfObjects, ArraysOfPrimitives)
}
}
@@ -198,6 +199,7 @@ class GenericFunction(val signature: String, val keyword: String = "fun") {
ArraysOfObjects, InvariantArraysOfObjects, ArraysOfPrimitives -> SourceFile.Arrays
Maps -> SourceFile.Maps
Strings -> SourceFile.Strings
CharSequences -> SourceFile.Strings
Primitives, Generic -> SourceFile.Misc
}
@@ -258,14 +260,14 @@ class GenericFunction(val signature: String, val keyword: String = "fun") {
}
"TCollection" -> {
when (f) {
Strings -> "Appendable"
Strings, CharSequences -> "Appendable"
else -> renderType("MutableCollection<in T>", receiver)
}
}
"T" -> {
when (f) {
Generic -> "T"
Strings -> "Char"
Strings, CharSequences -> "Char"
Maps -> "Map.Entry<K, V>"
else -> primitive?.name ?: token
}
@@ -300,6 +302,7 @@ class GenericFunction(val signature: String, val keyword: String = "fun") {
InvariantArraysOfObjects -> "Array<T>"
ArraysOfObjects -> "Array<${isAsteriskOrT.replace("T", "out T")}>"
Strings -> "String"
CharSequences -> "CharSequence"
Ranges -> "Range<$isAsteriskOrT>"
ArraysOfPrimitives -> primitive?.let { it.name + "Array" } ?: throw IllegalArgumentException("Primitive array should specify primitive type")
RangesOfPrimitives -> primitive?.let { it.name + "Range" } ?: throw IllegalArgumentException("Primitive range should specify primitive type")
@@ -328,7 +331,7 @@ class GenericFunction(val signature: String, val keyword: String = "fun") {
}
return types
}
else if (primitive == null && f != Strings) {
else if (primitive == null && f != Strings && f != CharSequences) {
val implicitTypeParameters = getGenericTypeParameters(receiver) + types.flatMap { getGenericTypeParameters(it) }
for (implicit in implicitTypeParameters.reversed()) {
if (implicit != "*" && !types.any { it.startsWith(implicit) || it.startsWith("reified " + implicit) }) {
libraries/tools/kotlin-stdlib-gen/src/templates/Filtering.kt
+42 -42
View File
@@ -47,9 +47,9 @@ fun filtering(): List<GenericFunction> {
"""
}
doc(Strings) { "Returns a string with the first [n] characters removed."}
body(Strings) { "return substring(Math.min(n, length()))" }
returns(Strings) { "String" }
doc(CharSequences) { "Returns a string with the first [n] characters removed."}
body(CharSequences) { "return substring(Math.min(n, length()))" }
returns(CharSequences) { "String" }
body(ArraysOfObjects, ArraysOfPrimitives) {
"""
@@ -88,14 +88,14 @@ fun filtering(): List<GenericFunction> {
"""
}
doc(Strings) { "Returns a string containing the first [n] characters from this string, or the entire string if this string is shorter."}
body(Strings) {
doc(CharSequences) { "Returns a string containing the first [n] characters from this string, or the entire string if this string is shorter."}
body(CharSequences) {
"""
require(n >= 0, { "Requested character count $n is less than zero." })
return substring(0, Math.min(n, length()))
"""
}
returns(Strings) { "String" }
returns(CharSequences) { "String" }
doc(Sequences) { "Returns a sequence containing first [n] elements." }
returns(Sequences) { "Sequence<T>" }
@@ -125,7 +125,7 @@ fun filtering(): List<GenericFunction> {
templates add f("dropLast(n: Int)") {
val n = "\$n"
only(Lists, ArraysOfObjects, ArraysOfPrimitives, Strings)
only(Lists, ArraysOfObjects, ArraysOfPrimitives, CharSequences)
doc { "Returns a list containing all elements except last [n] elements." }
returns("List<T>")
@@ -136,9 +136,9 @@ fun filtering(): List<GenericFunction> {
"""
}
doc(Strings) { "Returns a string with the last [n] characters removed." }
returns("String", Strings)
body(Strings) {
doc(CharSequences) { "Returns a string with the last [n] characters removed." }
returns("String", CharSequences)
body(CharSequences) {
"""
require(n >= 0, { "Requested character count $n is less than zero." })
return take((length() - n).coerceAtLeast(0))
@@ -149,18 +149,18 @@ fun filtering(): List<GenericFunction> {
templates add f("takeLast(n: Int)") {
val n = "\$n"
doc { "Returns a list containing last [n] elements." }
only(Lists, ArraysOfObjects, ArraysOfPrimitives, Strings)
only(Lists, ArraysOfObjects, ArraysOfPrimitives, CharSequences)
returns("List<T>")
doc(Strings) { "Returns a string containing the last [n] characters from this string, or the entire string if this string is shorter."}
body(Strings) {
doc(CharSequences) { "Returns a string containing the last [n] characters from this string, or the entire string if this string is shorter."}
body(CharSequences) {
"""
require(n >= 0, { "Requested character count $n is less than zero." })
val length = length()
return substring(length - Math.min(n, length), length)
"""
}
returns(Strings) { "String" }
returns(CharSequences) { "String" }
body(Lists, ArraysOfObjects, ArraysOfPrimitives) {
"""
@@ -196,9 +196,9 @@ fun filtering(): List<GenericFunction> {
"""
}
doc(Strings) { "Returns a string containing all characters except first characters that satisfy the given [predicate]." }
returns(Strings) { "String" }
body(Strings) {
doc(CharSequences) { "Returns a string containing all characters except first characters that satisfy the given [predicate]." }
returns(CharSequences) { "String" }
body(CharSequences) {
"""
return trimStart(predicate)
"""
@@ -232,15 +232,15 @@ fun filtering(): List<GenericFunction> {
"""
}
doc(Strings) { "Returns a string containing the first characters that satisfy the given [predicate]."}
returns(Strings) { "String" }
body(Strings) {
doc(CharSequences) { "Returns a string containing the first characters that satisfy the given [predicate]."}
returns(CharSequences) { "String" }
body(CharSequences) {
"""
for (index in 0..length() - 1)
if (!predicate(get(index))) {
return substring(0, index)
}
return this
return this.toString()
"""
}
@@ -256,7 +256,7 @@ fun filtering(): List<GenericFunction> {
templates add f("dropLastWhile(predicate: (T) -> Boolean)") {
inline(true)
only(Lists, ArraysOfObjects, ArraysOfPrimitives, Strings)
only(Lists, ArraysOfObjects, ArraysOfPrimitives, CharSequences)
doc { "Returns a list containing all elements except last elements that satisfy the given [predicate]." }
returns("List<T>")
@@ -271,9 +271,9 @@ fun filtering(): List<GenericFunction> {
"""
}
doc(Strings) { "Returns a string containing all characters except last characters that satisfy the given [predicate]." }
returns("String", Strings)
body(Strings) {
doc(CharSequences) { "Returns a string containing all characters except last characters that satisfy the given [predicate]." }
returns("String", CharSequences)
body(CharSequences) {
"""
return trimEnd(predicate)
"""
@@ -282,7 +282,7 @@ fun filtering(): List<GenericFunction> {
templates add f("takeLastWhile(predicate: (T) -> Boolean)") {
inline(true)
only(Lists, ArraysOfObjects, ArraysOfPrimitives, Strings)
only(Lists, ArraysOfObjects, ArraysOfPrimitives, CharSequences)
doc { "Returns a list containing last elements satisfying the given [predicate]."}
returns("List<T>")
@@ -297,16 +297,16 @@ fun filtering(): List<GenericFunction> {
"""
}
doc(Strings) { "Returns a string containing last characters that satisfy the given [predicate]." }
returns("String", Strings)
body(Strings) {
doc(CharSequences) { "Returns a string containing last characters that satisfy the given [predicate]." }
returns("String", CharSequences)
body(CharSequences) {
"""
for (index in lastIndex downTo 0) {
if (!predicate(this[index])) {
return substring(index + 1)
}
}
return this
return this.toString()
"""
}
}
@@ -322,9 +322,9 @@ fun filtering(): List<GenericFunction> {
"""
}
doc(Strings) { "Returns a string containing only those characters from the original string that match the given [predicate]." }
returns(Strings) { "String" }
body(Strings) {
doc(CharSequences) { "Returns a string containing only those characters from the original string that match the given [predicate]." }
returns(CharSequences) { "String" }
body(CharSequences) {
"""
return filterTo(StringBuilder(), predicate).toString()
"""
@@ -354,8 +354,8 @@ fun filtering(): List<GenericFunction> {
"""
}
doc(Strings) { "Appends all characters matching the given [predicate] to the given [destination]." }
body(Strings) {
doc(CharSequences) { "Appends all characters matching the given [predicate] to the given [destination]." }
body(CharSequences) {
"""
for (index in 0..length() - 1) {
val element = get(index)
@@ -377,9 +377,9 @@ fun filtering(): List<GenericFunction> {
"""
}
doc(Strings) { "Returns a string containing only those characters from the original string that do not match the given [predicate]." }
returns(Strings) { "String" }
body(Strings) {
doc(CharSequences) { "Returns a string containing only those characters from the original string that do not match the given [predicate]." }
returns(CharSequences) { "String" }
body(CharSequences) {
"""
return filterNotTo(StringBuilder(), predicate).toString()
"""
@@ -409,8 +409,8 @@ fun filtering(): List<GenericFunction> {
"""
}
doc(Strings) { "Appends all characters not matching the given [predicate] to the given [destination]." }
body(Strings) {
doc(CharSequences) { "Appends all characters not matching the given [predicate] to the given [destination]." }
body(CharSequences) {
"""
for (element in this) if (!predicate(element)) destination.append(element)
return destination
@@ -419,7 +419,7 @@ fun filtering(): List<GenericFunction> {
}
templates add f("filterNotNull()") {
exclude(ArraysOfPrimitives, Strings)
exclude(ArraysOfPrimitives)
doc { "Returns a list containing all elements that are not `null`." }
typeParam("T : Any")
returns("List<T>")
@@ -440,7 +440,7 @@ fun filtering(): List<GenericFunction> {
}
templates add f("filterNotNullTo(destination: C)") {
exclude(ArraysOfPrimitives, Strings)
exclude(ArraysOfPrimitives)
doc { "Appends all elements that are not `null` to the given [destination]." }
returns("C")
typeParam("C : TCollection")
libraries/tools/kotlin-stdlib-gen/src/templates/Generators.kt
+9 -9
View File
@@ -419,15 +419,15 @@ fun generators(): List<GenericFunction> {
"""
}
doc(Strings) {
doc(CharSequences) {
"""
Splits the original string into pair of strings,
where *first* string contains characters for which [predicate] yielded `true`,
while *second* string contains characters for which [predicate] yielded `false`.
"""
}
returns(Strings) { "Pair<String, String>" }
body(Strings) {
returns(CharSequences) { "Pair<String, String>" }
body(CharSequences) {
"""
val first = StringBuilder()
val second = StringBuilder()
@@ -444,7 +444,7 @@ fun generators(): List<GenericFunction> {
}
templates add f("zip(other: Iterable<R>, transform: (T, R) -> V)") {
exclude(Sequences, Strings)
exclude(Sequences)
doc {
"""
Returns a list of values built from elements of both collections with same indexes using provided [transform]. List has length of shortest collection.
@@ -480,7 +480,7 @@ fun generators(): List<GenericFunction> {
}
templates add f("zip(array: Array<out R>, transform: (T, R) -> V)") {
exclude(Sequences, Strings)
exclude(Sequences)
doc {
"""
Returns a list of values built from elements of both collections with same indexes using provided [transform]. List has length of shortest collection.
@@ -555,7 +555,7 @@ fun generators(): List<GenericFunction> {
}
templates add f("zip(other: String, transform: (Char, Char) -> V)") {
only(Strings)
only(CharSequences)
doc {
"""
Returns a list of values built from characters of both strings with same indexes using provided [transform]. List has length of shortest string.
@@ -579,7 +579,7 @@ fun generators(): List<GenericFunction> {
templates add f("zip(other: Iterable<R>)") {
exclude(Sequences, Strings)
exclude(Sequences)
doc {
"""
Returns a list of pairs built from elements of both collections with same indexes. List has length of shortest collection.
@@ -595,7 +595,7 @@ fun generators(): List<GenericFunction> {
}
templates add f("zip(other: String)") {
only(Strings)
only(CharSequences)
doc {
"""
Returns a list of pairs built from characters of both strings with same indexes. List has length of shortest collection.
@@ -610,7 +610,7 @@ fun generators(): List<GenericFunction> {
}
templates add f("zip(array: Array<out R>)") {
exclude(Sequences, Strings)
exclude(Sequences)
doc {
"""
Returns a list of pairs built from elements of both collections with same indexes. List has length of shortest collection.
libraries/tools/kotlin-stdlib-gen/src/templates/Mapping.kt
+9 -6
View File
@@ -6,6 +6,7 @@ fun mapping(): List<GenericFunction> {
val templates = arrayListOf<GenericFunction>()
templates add f("withIndex()") {
include(CharSequences)
doc { "Returns a lazy [Iterable] of [IndexedValue] for each element of the original collection." }
returns("Iterable<IndexedValue<T>>")
body {
@@ -35,7 +36,7 @@ fun mapping(): List<GenericFunction> {
body(ArraysOfObjects, ArraysOfPrimitives) {
"return mapIndexedTo(ArrayList<R>(size()), transform)"
}
body(Strings) {
body(CharSequences) {
"return mapIndexedTo(ArrayList<R>(length()), transform)"
}
inline(false, Sequences)
@@ -58,7 +59,7 @@ fun mapping(): List<GenericFunction> {
body(ArraysOfObjects, ArraysOfPrimitives, Maps) {
"return mapTo(ArrayList<R>(size()), transform)"
}
body(Strings) {
body(CharSequences) {
"return mapTo(ArrayList<R>(length()), transform)"
}
@@ -118,7 +119,7 @@ fun mapping(): List<GenericFunction> {
return destination
"""
}
include(Maps)
include(Maps, CharSequences)
}
templates add f("mapIndexedTo(destination: C, transform: (Int, T) -> R)") {
@@ -142,7 +143,7 @@ fun mapping(): List<GenericFunction> {
return destination
"""
}
include(Maps)
include(Maps, CharSequences)
}
/*
@@ -185,7 +186,7 @@ fun mapping(): List<GenericFunction> {
body {
"return flatMapTo(ArrayList<R>(), transform)"
}
include(Maps)
include(Maps, CharSequences)
}
templates add f("flatMap(transform: (T) -> Sequence<R>)") {
@@ -214,7 +215,7 @@ fun mapping(): List<GenericFunction> {
return destination
"""
}
include(Maps)
include(Maps, CharSequences)
}
templates add f("flatMapTo(destination: C, transform: (T) -> Sequence<R>)") {
@@ -239,6 +240,7 @@ fun mapping(): List<GenericFunction> {
templates add f("groupBy(toKey: (T) -> K)") {
inline(true)
include(CharSequences)
doc { "Returns a map of the elements in original collection grouped by the result of given [toKey] function." }
typeParam("K")
returns("Map<K, List<T>>")
@@ -248,6 +250,7 @@ fun mapping(): List<GenericFunction> {
templates add f("groupByTo(map: MutableMap<K, MutableList<T>>, toKey: (T) -> K)") {
inline(true)
include(CharSequences)
typeParam("K")
doc { "Appends elements from original collection grouped by the result of given [toKey] function to the given [map]." }
returns("Map<K, MutableList<T>>")
libraries/tools/kotlin-stdlib-gen/src/templates/Ordering.kt
+3 -8
View File
@@ -39,9 +39,9 @@ fun ordering(): List<GenericFunction> {
"""
}
doc(Strings) { "Returns a string with characters in reversed order." }
returns(Strings) { "SELF" }
body(Strings) {
doc(CharSequences) { "Returns a string with characters in reversed order." }
returns(CharSequences) { "String" }
body(CharSequences) {
// TODO: Replace with StringBuilder(this) when JS can handle it
"""
return StringBuilder().append(this).reverse().toString()
@@ -78,7 +78,6 @@ fun ordering(): List<GenericFunction> {
}
templates add f("sorted()") {
exclude(Strings)
exclude(PrimitiveType.Boolean)
doc {
@@ -130,7 +129,6 @@ fun ordering(): List<GenericFunction> {
}
templates add f("sortedDescending()") {
exclude(Strings)
exclude(PrimitiveType.Boolean)
doc {
@@ -188,7 +186,6 @@ fun ordering(): List<GenericFunction> {
}
templates add f("sortedWith(comparator: Comparator<in T>)") {
exclude(Strings)
returns("List<T>")
doc {
"""
@@ -235,7 +232,6 @@ fun ordering(): List<GenericFunction> {
}
templates add f("sortedBy(crossinline selector: (T) -> R?)") {
exclude(Strings)
inline(true)
returns("List<T>")
typeParam("R : Comparable<R>")
@@ -257,7 +253,6 @@ fun ordering(): List<GenericFunction> {
}
templates add f("sortedByDescending(crossinline selector: (T) -> R?)") {
exclude(Strings)
inline(true)
returns("List<T>")
typeParam("R : Comparable<R>")
libraries/tools/kotlin-stdlib-gen/src/templates/Sequence.kt
+12 -1
View File
@@ -19,7 +19,7 @@ fun sequences(): List<GenericFunction> {
"""
}
body(ArraysOfObjects, ArraysOfPrimitives, Strings) {
body(ArraysOfObjects, ArraysOfPrimitives) {
"""
if (isEmpty()) return emptySequence()
return object : Sequence<T> {
@@ -30,6 +30,17 @@ fun sequences(): List<GenericFunction> {
"""
}
body(CharSequences) {
"""
if (this is String && isEmpty()) return emptySequence()
return object : Sequence<T> {
override fun iterator(): Iterator<T> {
return this@asSequence.iterator()
}
}
"""
}
body(Sequences) {
"""
return this
libraries/tools/kotlin-stdlib-gen/src/templates/Snapshots.kt
+10 -6
View File
@@ -7,6 +7,7 @@ fun snapshots(): List<GenericFunction> {
val templates = arrayListOf<GenericFunction>()
templates add f("toCollection(collection: C)") {
include(CharSequences)
doc { "Appends all elements to the given [collection]." }
returns("C")
typeParam("C : MutableCollection<in T>")
@@ -25,7 +26,7 @@ fun snapshots(): List<GenericFunction> {
returns("Set<T>")
body { "return toCollection(LinkedHashSet<T>(mapCapacity(collectionSizeOrDefault(12))))" }
body(Sequences) { "return toCollection(LinkedHashSet<T>())" }
body(Strings) { "return toCollection(LinkedHashSet<T>(mapCapacity(length())))" }
body(CharSequences) { "return toCollection(LinkedHashSet<T>(mapCapacity(length())))" }
body(ArraysOfObjects, ArraysOfPrimitives) { "return toCollection(LinkedHashSet<T>(mapCapacity(size())))" }
}
@@ -34,11 +35,12 @@ fun snapshots(): List<GenericFunction> {
returns("HashSet<T>")
body { "return toCollection(HashSet<T>(mapCapacity(collectionSizeOrDefault(12))))" }
body(Sequences) { "return toCollection(HashSet<T>())" }
body(Strings) { "return toCollection(HashSet<T>(mapCapacity(length())))" }
body(CharSequences) { "return toCollection(HashSet<T>(mapCapacity(length())))" }
body(ArraysOfObjects, ArraysOfPrimitives) { "return toCollection(HashSet<T>(mapCapacity(size())))" }
}
templates add f("toSortedSet()") {
include(CharSequences)
doc { "Returns a [SortedSet] of all elements." }
returns("SortedSet<T>")
body { "return toCollection(TreeSet<T>())" }
@@ -56,7 +58,7 @@ fun snapshots(): List<GenericFunction> {
"""
}
body(Collections) { "return ArrayList(this)" }
body(Strings) { "return toCollection(ArrayList<T>(length()))" }
body(CharSequences) { "return toCollection(ArrayList<T>(length()))" }
body(ArraysOfObjects) { "return ArrayList(this.asCollection())" }
body(ArraysOfPrimitives) {
"""
@@ -82,12 +84,14 @@ fun snapshots(): List<GenericFunction> {
}
templates add f("toList()") {
include(CharSequences)
doc { "Returns a [List] containing all elements." }
returns("List<T>")
body { "return this.toArrayList()" }
}
templates add f("toLinkedList()") {
include(Strings)
doc { "Returns a [LinkedList] containing all elements." }
returns("LinkedList<T>")
deprecate { Deprecation("Use toCollection(LinkedList()) instead.", replaceWith = "toCollection(LinkedList())") }
@@ -95,7 +99,7 @@ fun snapshots(): List<GenericFunction> {
templates add f("toMap(selector: (T) -> K)") {
inline(true)
include(Strings)
include(CharSequences)
typeParam("K")
returns("Map<K, T>")
deprecate(Deprecation("Use toMapBy instead.", replaceWith = "toMapBy(selector)"))
@@ -136,7 +140,7 @@ fun snapshots(): List<GenericFunction> {
return result
"""
}
body(Strings) {
body(CharSequences) {
"""
val capacity = (length()/.75f) + 1
val result = LinkedHashMap<K, T>(Math.max(capacity.toInt(), 16))
@@ -194,7 +198,7 @@ fun snapshots(): List<GenericFunction> {
return result
"""
}
body(Strings) {
body(CharSequences) {
"""
val capacity = (length()/.75f) + 1
val result = LinkedHashMap<K, V>(Math.max(capacity.toInt(), 16))