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/stdlib/src/generated/_Arrays.kt
+9 -9
View File
@@ -8287,7 +8287,7 @@ public fun ShortArray.min(): Short? {
* Returns the first element yielding the smallest value of the given function or `null` if there are no elements.
*/
public inline fun <R : Comparable<R>, T : Any> Array<out T>.minBy(f: (T) -> R): T? {
if (size() == 0) return null
if (isEmpty()) return null
var minElem = this[0]
var minValue = f(minElem)
for (i in 1..lastIndex) {
@@ -8305,7 +8305,7 @@ public inline fun <R : Comparable<R>, T : Any> Array<out T>.minBy(f: (T) -> R):
* Returns the first element yielding the smallest value of the given function or `null` if there are no elements.
*/
public inline fun <R : Comparable<R>> BooleanArray.minBy(f: (Boolean) -> R): Boolean? {
if (size() == 0) return null
if (isEmpty()) return null
var minElem = this[0]
var minValue = f(minElem)
for (i in 1..lastIndex) {
@@ -8323,7 +8323,7 @@ public inline fun <R : Comparable<R>> BooleanArray.minBy(f: (Boolean) -> R): Boo
* Returns the first element yielding the smallest value of the given function or `null` if there are no elements.
*/
public inline fun <R : Comparable<R>> ByteArray.minBy(f: (Byte) -> R): Byte? {
if (size() == 0) return null
if (isEmpty()) return null
var minElem = this[0]
var minValue = f(minElem)
for (i in 1..lastIndex) {
@@ -8341,7 +8341,7 @@ public inline fun <R : Comparable<R>> ByteArray.minBy(f: (Byte) -> R): Byte? {
* Returns the first element yielding the smallest value of the given function or `null` if there are no elements.
*/
public inline fun <R : Comparable<R>> CharArray.minBy(f: (Char) -> R): Char? {
if (size() == 0) return null
if (isEmpty()) return null
var minElem = this[0]
var minValue = f(minElem)
for (i in 1..lastIndex) {
@@ -8359,7 +8359,7 @@ public inline fun <R : Comparable<R>> CharArray.minBy(f: (Char) -> R): Char? {
* Returns the first element yielding the smallest value of the given function or `null` if there are no elements.
*/
public inline fun <R : Comparable<R>> DoubleArray.minBy(f: (Double) -> R): Double? {
if (size() == 0) return null
if (isEmpty()) return null
var minElem = this[0]
var minValue = f(minElem)
for (i in 1..lastIndex) {
@@ -8377,7 +8377,7 @@ public inline fun <R : Comparable<R>> DoubleArray.minBy(f: (Double) -> R): Doubl
* Returns the first element yielding the smallest value of the given function or `null` if there are no elements.
*/
public inline fun <R : Comparable<R>> FloatArray.minBy(f: (Float) -> R): Float? {
if (size() == 0) return null
if (isEmpty()) return null
var minElem = this[0]
var minValue = f(minElem)
for (i in 1..lastIndex) {
@@ -8395,7 +8395,7 @@ public inline fun <R : Comparable<R>> FloatArray.minBy(f: (Float) -> R): Float?
* Returns the first element yielding the smallest value of the given function or `null` if there are no elements.
*/
public inline fun <R : Comparable<R>> IntArray.minBy(f: (Int) -> R): Int? {
if (size() == 0) return null
if (isEmpty()) return null
var minElem = this[0]
var minValue = f(minElem)
for (i in 1..lastIndex) {
@@ -8413,7 +8413,7 @@ public inline fun <R : Comparable<R>> IntArray.minBy(f: (Int) -> R): Int? {
* Returns the first element yielding the smallest value of the given function or `null` if there are no elements.
*/
public inline fun <R : Comparable<R>> LongArray.minBy(f: (Long) -> R): Long? {
if (size() == 0) return null
if (isEmpty()) return null
var minElem = this[0]
var minValue = f(minElem)
for (i in 1..lastIndex) {
@@ -8431,7 +8431,7 @@ public inline fun <R : Comparable<R>> LongArray.minBy(f: (Long) -> R): Long? {
* Returns the first element yielding the smallest value of the given function or `null` if there are no elements.
*/
public inline fun <R : Comparable<R>> ShortArray.minBy(f: (Short) -> R): Short? {
if (size() == 0) return null
if (isEmpty()) return null
var minElem = this[0]
var minValue = f(minElem)
for (i in 1..lastIndex) {
libraries/stdlib/src/generated/_Strings.kt
+96 -100
View File
@@ -15,43 +15,43 @@ import java.util.Collections // TODO: it's temporary while we have java.util.Col
/**
* Returns an element at the given [index] or throws an [IndexOutOfBoundsException] if the [index] is out of bounds of this collection.
*/
public fun String.elementAt(index: Int): Char {
public fun CharSequence.elementAt(index: Int): Char {
return get(index)
}
/**
* 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.
*/
public inline fun String.elementAtOrElse(index: Int, defaultValue: (Int) -> Char): Char {
public inline fun CharSequence.elementAtOrElse(index: Int, defaultValue: (Int) -> Char): Char {
return if (index >= 0 && index <= lastIndex) get(index) else defaultValue(index)
}
/**
* Returns an element at the given [index] or `null` if the [index] is out of bounds of this collection.
*/
public fun String.elementAtOrNull(index: Int): Char? {
public fun CharSequence.elementAtOrNull(index: Int): Char? {
return if (index >= 0 && index <= lastIndex) get(index) else null
}
/**
* Returns the first character matching the given [predicate], or `null` if character was not found.
*/
public inline fun String.find(predicate: (Char) -> Boolean): Char? {
public inline fun CharSequence.find(predicate: (Char) -> Boolean): Char? {
return firstOrNull(predicate)
}
/**
* Returns the last character matching the given [predicate], or `null` if no such character was found.
*/
public inline fun String.findLast(predicate: (Char) -> Boolean): Char? {
public inline fun CharSequence.findLast(predicate: (Char) -> Boolean): Char? {
return lastOrNull(predicate)
}
/**
* Returns first character.
* @throws [NoSuchElementException] if the string is empty.
* @throws [NoSuchElementException] if the CharSequence is empty.
*/
public fun String.first(): Char {
public fun CharSequence.first(): Char {
if (isEmpty())
throw NoSuchElementException("Collection is empty.")
return this[0]
@@ -61,22 +61,22 @@ public fun String.first(): Char {
* Returns the first character matching the given [predicate].
* @throws [NoSuchElementException] if no such character is found.
*/
public inline fun String.first(predicate: (Char) -> Boolean): Char {
public inline fun CharSequence.first(predicate: (Char) -> Boolean): Char {
for (element in this) if (predicate(element)) return element
throw NoSuchElementException("No element matching predicate was found.")
}
/**
* Returns the first character, or `null` if string is empty.
* Returns the first character, or `null` if CharSequence is empty.
*/
public fun String.firstOrNull(): Char? {
public fun CharSequence.firstOrNull(): Char? {
return if (isEmpty()) null else this[0]
}
/**
* Returns the first character matching the given [predicate], or `null` if character was not found.
*/
public inline fun String.firstOrNull(predicate: (Char) -> Boolean): Char? {
public inline fun CharSequence.firstOrNull(predicate: (Char) -> Boolean): Char? {
for (element in this) if (predicate(element)) return element
return null
}
@@ -84,21 +84,21 @@ public inline fun String.firstOrNull(predicate: (Char) -> Boolean): Char? {
/**
* 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.
*/
public inline fun String.getOrElse(index: Int, defaultValue: (Int) -> Char): Char {
public inline fun CharSequence.getOrElse(index: Int, defaultValue: (Int) -> Char): Char {
return if (index >= 0 && index <= lastIndex) get(index) else defaultValue(index)
}
/**
* Returns an element at the given [index] or `null` if the [index] is out of bounds of this collection.
*/
public fun String.getOrNull(index: Int): Char? {
public fun CharSequence.getOrNull(index: Int): Char? {
return if (index >= 0 && index <= lastIndex) get(index) else null
}
/**
* Returns index of the first element matching the given [predicate], or -1 if the collection does not contain such element.
*/
public inline fun String.indexOfFirst(predicate: (Char) -> Boolean): Int {
public inline fun CharSequence.indexOfFirst(predicate: (Char) -> Boolean): Int {
for (index in indices) {
if (predicate(this[index])) {
return index
@@ -110,7 +110,7 @@ public inline fun String.indexOfFirst(predicate: (Char) -> Boolean): Int {
/**
* Returns index of the last element matching the given [predicate], or -1 if the collection does not contain such element.
*/
public inline fun String.indexOfLast(predicate: (Char) -> Boolean): Int {
public inline fun CharSequence.indexOfLast(predicate: (Char) -> Boolean): Int {
for (index in indices.reversed()) {
if (predicate(this[index])) {
return index
@@ -123,7 +123,7 @@ public inline fun String.indexOfLast(predicate: (Char) -> Boolean): Int {
* "Returns the last character.
* @throws [NoSuchElementException] if the string is empty.
*/
public fun String.last(): Char {
public fun CharSequence.last(): Char {
if (isEmpty())
throw NoSuchElementException("Collection is empty.")
return this[lastIndex]
@@ -133,7 +133,7 @@ public fun String.last(): Char {
* "Returns the last character matching the given [predicate].
* @throws [NoSuchElementException] if no such character is found.
*/
public inline fun String.last(predicate: (Char) -> Boolean): Char {
public inline fun CharSequence.last(predicate: (Char) -> Boolean): Char {
var last: Char? = null
var found = false
for (element in this) {
@@ -149,14 +149,14 @@ public inline fun String.last(predicate: (Char) -> Boolean): Char {
/**
* Returns the last character, or `null` if the string is empty.
*/
public fun String.lastOrNull(): Char? {
public fun CharSequence.lastOrNull(): Char? {
return if (isEmpty()) null else this[length() - 1]
}
/**
* Returns the last character matching the given [predicate], or `null` if no such character was found.
*/
public inline fun String.lastOrNull(predicate: (Char) -> Boolean): Char? {
public inline fun CharSequence.lastOrNull(predicate: (Char) -> Boolean): Char? {
var last: Char? = null
for (element in this) {
if (predicate(element)) {
@@ -169,7 +169,7 @@ public inline fun String.lastOrNull(predicate: (Char) -> Boolean): Char? {
/**
* Returns the single character, or throws an exception if the string is empty or has more than one character.
*/
public fun String.single(): Char {
public fun CharSequence.single(): Char {
return when (length()) {
0 -> throw NoSuchElementException("Collection is empty.")
1 -> this[0]
@@ -180,7 +180,7 @@ public fun String.single(): Char {
/**
* Returns the single character matching the given [predicate], or throws exception if there is no or more than one matching character.
*/
public inline fun String.single(predicate: (Char) -> Boolean): Char {
public inline fun CharSequence.single(predicate: (Char) -> Boolean): Char {
var single: Char? = null
var found = false
for (element in this) {
@@ -197,14 +197,14 @@ public inline fun String.single(predicate: (Char) -> Boolean): Char {
/**
* Returns the single character, or `null` if the string is empty or has more than one character.
*/
public fun String.singleOrNull(): Char? {
public fun CharSequence.singleOrNull(): Char? {
return if (length() == 1) this[0] else null
}
/**
* Returns the single character matching the given [predicate], or `null` if character was not found or more than one character was found.
*/
public inline fun String.singleOrNull(predicate: (Char) -> Boolean): Char? {
public inline fun CharSequence.singleOrNull(predicate: (Char) -> Boolean): Char? {
var single: Char? = null
var found = false
for (element in this) {
@@ -221,14 +221,14 @@ public inline fun String.singleOrNull(predicate: (Char) -> Boolean): Char? {
/**
* Returns a string with the first [n] characters removed.
*/
public fun String.drop(n: Int): String {
public fun CharSequence.drop(n: Int): String {
return substring(Math.min(n, length()))
}
/**
* Returns a string with the last [n] characters removed.
*/
public fun String.dropLast(n: Int): String {
public fun CharSequence.dropLast(n: Int): String {
require(n >= 0, { "Requested character count $n is less than zero." })
return take((length() - n).coerceAtLeast(0))
}
@@ -236,35 +236,35 @@ public fun String.dropLast(n: Int): String {
/**
* Returns a string containing all characters except last characters that satisfy the given [predicate].
*/
public inline fun String.dropLastWhile(predicate: (Char) -> Boolean): String {
public inline fun CharSequence.dropLastWhile(predicate: (Char) -> Boolean): String {
return trimEnd(predicate)
}
/**
* Returns a string containing all characters except first characters that satisfy the given [predicate].
*/
public inline fun String.dropWhile(predicate: (Char) -> Boolean): String {
public inline fun CharSequence.dropWhile(predicate: (Char) -> Boolean): String {
return trimStart(predicate)
}
/**
* Returns a string containing only those characters from the original string that match the given [predicate].
*/
public inline fun String.filter(predicate: (Char) -> Boolean): String {
public inline fun CharSequence.filter(predicate: (Char) -> Boolean): String {
return filterTo(StringBuilder(), predicate).toString()
}
/**
* Returns a string containing only those characters from the original string that do not match the given [predicate].
*/
public inline fun String.filterNot(predicate: (Char) -> Boolean): String {
public inline fun CharSequence.filterNot(predicate: (Char) -> Boolean): String {
return filterNotTo(StringBuilder(), predicate).toString()
}
/**
* Appends all characters not matching the given [predicate] to the given [destination].
*/
public inline fun <C : Appendable> String.filterNotTo(destination: C, predicate: (Char) -> Boolean): C {
public inline fun <C : Appendable> CharSequence.filterNotTo(destination: C, predicate: (Char) -> Boolean): C {
for (element in this) if (!predicate(element)) destination.append(element)
return destination
}
@@ -272,7 +272,7 @@ public inline fun <C : Appendable> String.filterNotTo(destination: C, predicate:
/**
* Appends all characters matching the given [predicate] to the given [destination].
*/
public inline fun <C : Appendable> String.filterTo(destination: C, predicate: (Char) -> Boolean): C {
public inline fun <C : Appendable> CharSequence.filterTo(destination: C, predicate: (Char) -> Boolean): C {
for (index in 0..length() - 1) {
val element = get(index)
if (predicate(element)) destination.append(element)
@@ -304,7 +304,7 @@ public fun String.slice(indices: Iterable<Int>): String {
/**
* Returns a string containing the first [n] characters from this string, or the entire string if this string is shorter.
*/
public fun String.take(n: Int): String {
public fun CharSequence.take(n: Int): String {
require(n >= 0, { "Requested character count $n is less than zero." })
return substring(0, Math.min(n, length()))
}
@@ -312,7 +312,7 @@ public fun String.take(n: Int): String {
/**
* Returns a string containing the last [n] characters from this string, or the entire string if this string is shorter.
*/
public fun String.takeLast(n: Int): String {
public fun CharSequence.takeLast(n: Int): String {
require(n >= 0, { "Requested character count $n is less than zero." })
val length = length()
return substring(length - Math.min(n, length), length)
@@ -321,44 +321,44 @@ public fun String.takeLast(n: Int): String {
/**
* Returns a string containing last characters that satisfy the given [predicate].
*/
public inline fun String.takeLastWhile(predicate: (Char) -> Boolean): String {
public inline fun CharSequence.takeLastWhile(predicate: (Char) -> Boolean): String {
for (index in lastIndex downTo 0) {
if (!predicate(this[index])) {
return substring(index + 1)
}
}
return this
return this.toString()
}
/**
* Returns a string containing the first characters that satisfy the given [predicate].
*/
public inline fun String.takeWhile(predicate: (Char) -> Boolean): String {
public inline fun CharSequence.takeWhile(predicate: (Char) -> Boolean): String {
for (index in 0..length() - 1)
if (!predicate(get(index))) {
return substring(0, index)
}
return this
return this.toString()
}
/**
* Returns a string with characters in reversed order.
*/
public fun String.reversed(): String {
public fun CharSequence.reversed(): String {
return StringBuilder().append(this).reverse().toString()
}
/**
* Returns an [ArrayList] of all elements.
*/
public fun String.toArrayList(): ArrayList<Char> {
public fun CharSequence.toArrayList(): ArrayList<Char> {
return toCollection(ArrayList<Char>(length()))
}
/**
* Appends all elements to the given [collection].
*/
public fun <C : MutableCollection<in Char>> String.toCollection(collection: C): C {
public fun <C : MutableCollection<in Char>> CharSequence.toCollection(collection: C): C {
for (item in this) {
collection.add(item)
}
@@ -368,7 +368,7 @@ public fun <C : MutableCollection<in Char>> String.toCollection(collection: C):
/**
* Returns a [HashSet] of all elements.
*/
public fun String.toHashSet(): HashSet<Char> {
public fun CharSequence.toHashSet(): HashSet<Char> {
return toCollection(HashSet<Char>(mapCapacity(length())))
}
@@ -383,12 +383,12 @@ public fun String.toLinkedList(): LinkedList<Char> {
/**
* Returns a [List] containing all elements.
*/
public fun String.toList(): List<Char> {
public fun CharSequence.toList(): List<Char> {
return this.toArrayList()
}
@Deprecated("Use toMapBy instead.", ReplaceWith("toMapBy(selector)"))
public inline fun <K> String.toMap(selector: (Char) -> K): Map<K, Char> {
public inline fun <K> CharSequence.toMap(selector: (Char) -> K): Map<K, Char> {
return toMapBy(selector)
}
@@ -396,7 +396,7 @@ public inline fun <K> String.toMap(selector: (Char) -> K): Map<K, Char> {
* Returns Map containing the values provided by [transform] and indexed by [selector] from the given collection.
* If any two elements would have the same key returned by [selector] the last one gets added to the map.
*/
public inline fun <K, V> String.toMap(selector: (Char) -> K, transform: (Char) -> V): Map<K, V> {
public inline fun <K, V> CharSequence.toMap(selector: (Char) -> K, transform: (Char) -> V): Map<K, V> {
val capacity = (length()/.75f) + 1
val result = LinkedHashMap<K, V>(Math.max(capacity.toInt(), 16))
for (element in this) {
@@ -409,7 +409,7 @@ public inline fun <K, V> String.toMap(selector: (Char) -> K, transform: (Char) -
* Returns Map containing the values from the given collection indexed by [selector].
* If any two elements would have the same key returned by [selector] the last one gets added to the map.
*/
public inline fun <K> String.toMapBy(selector: (Char) -> K): Map<K, Char> {
public inline fun <K> CharSequence.toMapBy(selector: (Char) -> K): Map<K, Char> {
val capacity = (length()/.75f) + 1
val result = LinkedHashMap<K, Char>(Math.max(capacity.toInt(), 16))
for (element in this) {
@@ -421,28 +421,28 @@ public inline fun <K> String.toMapBy(selector: (Char) -> K): Map<K, Char> {
/**
* Returns a [Set] of all elements.
*/
public fun String.toSet(): Set<Char> {
public fun CharSequence.toSet(): Set<Char> {
return toCollection(LinkedHashSet<Char>(mapCapacity(length())))
}
/**
* Returns a [SortedSet] of all elements.
*/
public fun String.toSortedSet(): SortedSet<Char> {
public fun CharSequence.toSortedSet(): SortedSet<Char> {
return toCollection(TreeSet<Char>())
}
/**
* Returns a single list of all elements yielded from results of [transform] function being invoked on each element of original collection.
*/
public inline fun <R> String.flatMap(transform: (Char) -> Iterable<R>): List<R> {
public inline fun <R> CharSequence.flatMap(transform: (Char) -> Iterable<R>): List<R> {
return flatMapTo(ArrayList<R>(), transform)
}
/**
* Appends all elements yielded from results of [transform] function being invoked on each element of original collection, to the given [destination].
*/
public inline fun <R, C : MutableCollection<in R>> String.flatMapTo(destination: C, transform: (Char) -> Iterable<R>): C {
public inline fun <R, C : MutableCollection<in R>> CharSequence.flatMapTo(destination: C, transform: (Char) -> Iterable<R>): C {
for (element in this) {
val list = transform(element)
destination.addAll(list)
@@ -453,14 +453,14 @@ public inline fun <R, C : MutableCollection<in R>> String.flatMapTo(destination:
/**
* Returns a map of the elements in original collection grouped by the result of given [toKey] function.
*/
public inline fun <K> String.groupBy(toKey: (Char) -> K): Map<K, List<Char>> {
public inline fun <K> CharSequence.groupBy(toKey: (Char) -> K): Map<K, List<Char>> {
return groupByTo(LinkedHashMap<K, MutableList<Char>>(), toKey)
}
/**
* Appends elements from original collection grouped by the result of given [toKey] function to the given [map].
*/
public inline fun <K> String.groupByTo(map: MutableMap<K, MutableList<Char>>, toKey: (Char) -> K): Map<K, MutableList<Char>> {
public inline fun <K> CharSequence.groupByTo(map: MutableMap<K, MutableList<Char>>, toKey: (Char) -> K): Map<K, MutableList<Char>> {
for (element in this) {
val key = toKey(element)
val list = map.getOrPut(key) { ArrayList<Char>() }
@@ -472,14 +472,14 @@ public inline fun <K> String.groupByTo(map: MutableMap<K, MutableList<Char>>, to
/**
* Returns a list containing the results of applying the given [transform] function to each element of the original collection.
*/
public inline fun <R> String.map(transform: (Char) -> R): List<R> {
public inline fun <R> CharSequence.map(transform: (Char) -> R): List<R> {
return mapTo(ArrayList<R>(length()), transform)
}
/**
* Returns a list containing the results of applying the given [transform] function to each element and its index of the original collection.
*/
public inline fun <R> String.mapIndexed(transform: (Int, Char) -> R): List<R> {
public inline fun <R> CharSequence.mapIndexed(transform: (Int, Char) -> R): List<R> {
return mapIndexedTo(ArrayList<R>(length()), transform)
}
@@ -487,7 +487,7 @@ public inline fun <R> String.mapIndexed(transform: (Int, Char) -> R): List<R> {
* Appends transformed elements and their indices of the original collection using the given [transform] function
* to the given [destination].
*/
public inline fun <R, C : MutableCollection<in R>> String.mapIndexedTo(destination: C, transform: (Int, Char) -> R): C {
public inline fun <R, C : MutableCollection<in R>> CharSequence.mapIndexedTo(destination: C, transform: (Int, Char) -> R): C {
var index = 0
for (item in this)
destination.add(transform(index++, item))
@@ -498,7 +498,7 @@ public inline fun <R, C : MutableCollection<in R>> String.mapIndexedTo(destinati
* Appends transformed elements of the original collection using the given [transform] function
* to the given [destination].
*/
public inline fun <R, C : MutableCollection<in R>> String.mapTo(destination: C, transform: (Char) -> R): C {
public inline fun <R, C : MutableCollection<in R>> CharSequence.mapTo(destination: C, transform: (Char) -> R): C {
for (item in this)
destination.add(transform(item))
return destination
@@ -507,14 +507,14 @@ public inline fun <R, C : MutableCollection<in R>> String.mapTo(destination: C,
/**
* Returns a lazy [Iterable] of [IndexedValue] for each element of the original collection.
*/
public fun String.withIndex(): Iterable<IndexedValue<Char>> {
public fun CharSequence.withIndex(): Iterable<IndexedValue<Char>> {
return IndexingIterable { iterator() }
}
/**
* Returns `true` if all elements match the given [predicate].
*/
public inline fun String.all(predicate: (Char) -> Boolean): Boolean {
public inline fun CharSequence.all(predicate: (Char) -> Boolean): Boolean {
for (element in this) if (!predicate(element)) return false
return true
}
@@ -522,7 +522,7 @@ public inline fun String.all(predicate: (Char) -> Boolean): Boolean {
/**
* Returns `true` if collection has at least one element.
*/
public fun String.any(): Boolean {
public fun CharSequence.any(): Boolean {
for (element in this) return true
return false
}
@@ -530,7 +530,7 @@ public fun String.any(): Boolean {
/**
* Returns `true` if at least one element matches the given [predicate].
*/
public inline fun String.any(predicate: (Char) -> Boolean): Boolean {
public inline fun CharSequence.any(predicate: (Char) -> Boolean): Boolean {
for (element in this) if (predicate(element)) return true
return false
}
@@ -538,14 +538,14 @@ public inline fun String.any(predicate: (Char) -> Boolean): Boolean {
/**
* Returns the length of this string.
*/
public fun String.count(): Int {
public fun CharSequence.count(): Int {
return length()
}
/**
* Returns the number of elements matching the given [predicate].
*/
public inline fun String.count(predicate: (Char) -> Boolean): Int {
public inline fun CharSequence.count(predicate: (Char) -> Boolean): Int {
var count = 0
for (element in this) if (predicate(element)) count++
return count
@@ -554,7 +554,7 @@ public inline fun String.count(predicate: (Char) -> Boolean): Int {
/**
* Accumulates value starting with [initial] value and applying [operation] from left to right to current accumulator value and each element.
*/
public inline fun <R> String.fold(initial: R, operation: (R, Char) -> R): R {
public inline fun <R> CharSequence.fold(initial: R, operation: (R, Char) -> R): R {
var accumulator = initial
for (element in this) accumulator = operation(accumulator, element)
return accumulator
@@ -563,7 +563,7 @@ public inline fun <R> String.fold(initial: R, operation: (R, Char) -> R): R {
/**
* Accumulates value starting with [initial] value and applying [operation] from right to left to each element and current accumulator value.
*/
public inline fun <R> String.foldRight(initial: R, operation: (Char, R) -> R): R {
public inline fun <R> CharSequence.foldRight(initial: R, operation: (Char, R) -> R): R {
var index = lastIndex
var accumulator = initial
while (index >= 0) {
@@ -575,14 +575,14 @@ public inline fun <R> String.foldRight(initial: R, operation: (Char, R) -> R): R
/**
* Performs the given [operation] on each element.
*/
public inline fun String.forEach(operation: (Char) -> Unit): Unit {
public inline fun CharSequence.forEach(operation: (Char) -> Unit): Unit {
for (element in this) operation(element)
}
/**
* Performs the given [operation] on each element, providing sequential index with the element.
*/
public inline fun String.forEachIndexed(operation: (Int, Char) -> Unit): Unit {
public inline fun CharSequence.forEachIndexed(operation: (Int, Char) -> Unit): Unit {
var index = 0
for (item in this) operation(index++, item)
}
@@ -590,12 +590,11 @@ public inline fun String.forEachIndexed(operation: (Int, Char) -> Unit): Unit {
/**
* Returns the largest element or `null` if there are no elements.
*/
public fun String.max(): Char? {
val iterator = iterator()
if (!iterator.hasNext()) return null
var max = iterator.next()
while (iterator.hasNext()) {
val e = iterator.next()
public fun CharSequence.max(): Char? {
if (isEmpty()) return null
var max = this[0]
for (i in 1..lastIndex) {
val e = this[i]
if (max < e) max = e
}
return max
@@ -604,13 +603,12 @@ public fun String.max(): Char? {
/**
* Returns the first element yielding the largest value of the given function or `null` if there are no elements.
*/
public inline fun <R : Comparable<R>> String.maxBy(f: (Char) -> R): Char? {
val iterator = iterator()
if (!iterator.hasNext()) return null
var maxElem = iterator.next()
public inline fun <R : Comparable<R>> CharSequence.maxBy(f: (Char) -> R): Char? {
if (isEmpty()) return null
var maxElem = this[0]
var maxValue = f(maxElem)
while (iterator.hasNext()) {
val e = iterator.next()
for (i in 1..lastIndex) {
val e = this[i]
val v = f(e)
if (maxValue < v) {
maxElem = e
@@ -623,12 +621,11 @@ public inline fun <R : Comparable<R>> String.maxBy(f: (Char) -> R): Char? {
/**
* Returns the smallest element or `null` if there are no elements.
*/
public fun String.min(): Char? {
val iterator = iterator()
if (!iterator.hasNext()) return null
var min = iterator.next()
while (iterator.hasNext()) {
val e = iterator.next()
public fun CharSequence.min(): Char? {
if (isEmpty()) return null
var min = this[0]
for (i in 1..lastIndex) {
val e = this[i]
if (min > e) min = e
}
return min
@@ -637,13 +634,12 @@ public fun String.min(): Char? {
/**
* Returns the first element yielding the smallest value of the given function or `null` if there are no elements.
*/
public inline fun <R : Comparable<R>> String.minBy(f: (Char) -> R): Char? {
val iterator = iterator()
if (!iterator.hasNext()) return null
var minElem = iterator.next()
public inline fun <R : Comparable<R>> CharSequence.minBy(f: (Char) -> R): Char? {
if (isEmpty()) return null
var minElem = this[0]
var minValue = f(minElem)
while (iterator.hasNext()) {
val e = iterator.next()
for (i in 1..lastIndex) {
val e = this[i]
val v = f(e)
if (minValue > v) {
minElem = e
@@ -656,7 +652,7 @@ public inline fun <R : Comparable<R>> String.minBy(f: (Char) -> R): Char? {
/**
* Returns `true` if collection has no elements.
*/
public fun String.none(): Boolean {
public fun CharSequence.none(): Boolean {
for (element in this) return false
return true
}
@@ -664,7 +660,7 @@ public fun String.none(): Boolean {
/**
* Returns `true` if no elements match the given [predicate].
*/
public inline fun String.none(predicate: (Char) -> Boolean): Boolean {
public inline fun CharSequence.none(predicate: (Char) -> Boolean): Boolean {
for (element in this) if (predicate(element)) return false
return true
}
@@ -672,7 +668,7 @@ public inline fun String.none(predicate: (Char) -> Boolean): Boolean {
/**
* Accumulates value starting with the first element and applying [operation] from left to right to current accumulator value and each element.
*/
public inline fun String.reduce(operation: (Char, Char) -> Char): Char {
public inline fun CharSequence.reduce(operation: (Char, Char) -> Char): Char {
val iterator = this.iterator()
if (!iterator.hasNext()) throw UnsupportedOperationException("Empty iterable can't be reduced.")
var accumulator = iterator.next()
@@ -685,7 +681,7 @@ public inline fun String.reduce(operation: (Char, Char) -> Char): Char {
/**
* Accumulates value starting with last element and applying [operation] from right to left to each element and current accumulator value.
*/
public inline fun String.reduceRight(operation: (Char, Char) -> Char): Char {
public inline fun CharSequence.reduceRight(operation: (Char, Char) -> Char): Char {
var index = lastIndex
if (index < 0) throw UnsupportedOperationException("Empty iterable can't be reduced.")
var accumulator = get(index--)
@@ -698,7 +694,7 @@ public inline fun String.reduceRight(operation: (Char, Char) -> Char): Char {
/**
* Returns the sum of all values produced by [transform] function from characters in the string.
*/
public inline fun String.sumBy(transform: (Char) -> Int): Int {
public inline fun CharSequence.sumBy(transform: (Char) -> Int): Int {
var sum: Int = 0
for (element in this) {
sum += transform(element)
@@ -709,7 +705,7 @@ public inline fun String.sumBy(transform: (Char) -> Int): Int {
/**
* Returns the sum of all values produced by [transform] function from characters in the string.
*/
public inline fun String.sumByDouble(transform: (Char) -> Double): Double {
public inline fun CharSequence.sumByDouble(transform: (Char) -> Double): Double {
var sum: Double = 0.0
for (element in this) {
sum += transform(element)
@@ -722,7 +718,7 @@ public inline fun String.sumByDouble(transform: (Char) -> Double): Double {
* where *first* string contains characters for which [predicate] yielded `true`,
* while *second* string contains characters for which [predicate] yielded `false`.
*/
public inline fun String.partition(predicate: (Char) -> Boolean): Pair<String, String> {
public inline fun CharSequence.partition(predicate: (Char) -> Boolean): Pair<String, String> {
val first = StringBuilder()
val second = StringBuilder()
for (element in this) {
@@ -738,14 +734,14 @@ public inline fun String.partition(predicate: (Char) -> Boolean): Pair<String, S
/**
* Returns a list of pairs built from characters of both strings with same indexes. List has length of shortest collection.
*/
public fun String.zip(other: String): List<Pair<Char, Char>> {
public fun CharSequence.zip(other: String): List<Pair<Char, Char>> {
return zip(other) { c1, c2 -> c1 to c2 }
}
/**
* Returns a list of values built from characters of both strings with same indexes using provided [transform]. List has length of shortest string.
*/
public inline fun <V> String.zip(other: String, transform: (Char, Char) -> V): List<V> {
public inline fun <V> CharSequence.zip(other: String, transform: (Char, Char) -> V): List<V> {
val length = Math.min(this.length(), other.length())
val list = ArrayList<V>(length)
for (i in 0..length-1) {
@@ -757,8 +753,8 @@ public inline fun <V> String.zip(other: String, transform: (Char, Char) -> V): L
/**
* Returns a sequence from the given collection.
*/
public fun String.asSequence(): Sequence<Char> {
if (isEmpty()) return emptySequence()
public fun CharSequence.asSequence(): Sequence<Char> {
if (this is String && isEmpty()) return emptySequence()
return object : Sequence<Char> {
override fun iterator(): Iterator<Char> {
return this@asSequence.iterator()