Merge pull request #88 from zolotov/fix-reverse-and-sort-for-lists

Fix reverse and sort functions for lists
This commit is contained in:
James Strachan
2012-07-02 03:42:05 -07:00
16 changed files with 71 additions and 39 deletions
@@ -245,7 +245,8 @@ public inline fun <in T, C: Collection<in T>> Array<T>.toCollection(result: C) :
*/
public inline fun <T> Array<T>.reverse() : List<T> {
val list = toList()
return list.reverse()
Collections.reverse(list)
return list
}
/** Copies all elements into a [[LinkedList]] */
@@ -245,7 +245,8 @@ public inline fun <C: Collection<Boolean>> BooleanArray.toCollection(result: C)
*/
public inline fun BooleanArray.reverse() : List<Boolean> {
val list = toList()
return list.reverse()
Collections.reverse(list)
return list
}
/** Copies all elements into a [[LinkedList]] */
@@ -245,7 +245,8 @@ public inline fun <C: Collection<Byte>> ByteArray.toCollection(result: C) : C {
*/
public inline fun ByteArray.reverse() : List<Byte> {
val list = toList()
return list.reverse()
Collections.reverse(list)
return list
}
/** Copies all elements into a [[LinkedList]] */
@@ -245,7 +245,8 @@ public inline fun <C: Collection<Char>> CharArray.toCollection(result: C) : C {
*/
public inline fun CharArray.reverse() : List<Char> {
val list = toList()
return list.reverse()
Collections.reverse(list)
return list
}
/** Copies all elements into a [[LinkedList]] */
@@ -245,7 +245,8 @@ public inline fun <C: Collection<Double>> DoubleArray.toCollection(result: C) :
*/
public inline fun DoubleArray.reverse() : List<Double> {
val list = toList()
return list.reverse()
Collections.reverse(list)
return list
}
/** Copies all elements into a [[LinkedList]] */
@@ -245,7 +245,8 @@ public inline fun <C: Collection<Float>> FloatArray.toCollection(result: C) : C
*/
public inline fun FloatArray.reverse() : List<Float> {
val list = toList()
return list.reverse()
Collections.reverse(list)
return list
}
/** Copies all elements into a [[LinkedList]] */
@@ -245,7 +245,8 @@ public inline fun <C: Collection<Int>> IntArray.toCollection(result: C) : C {
*/
public inline fun IntArray.reverse() : List<Int> {
val list = toList()
return list.reverse()
Collections.reverse(list)
return list
}
/** Copies all elements into a [[LinkedList]] */
@@ -243,7 +243,8 @@ public inline fun <in T, C: Collection<in T>> java.util.Iterator<T>.toCollection
*/
public inline fun <T> java.util.Iterator<T>.reverse() : List<T> {
val list = toList()
return list.reverse()
Collections.reverse(list)
return list
}
/** Copies all elements into a [[LinkedList]] */
@@ -245,7 +245,8 @@ public inline fun <C: Collection<Long>> LongArray.toCollection(result: C) : C {
*/
public inline fun LongArray.reverse() : List<Long> {
val list = toList()
return list.reverse()
Collections.reverse(list)
return list
}
/** Copies all elements into a [[LinkedList]] */
@@ -245,7 +245,8 @@ public inline fun <C: Collection<Short>> ShortArray.toCollection(result: C) : C
*/
public inline fun ShortArray.reverse() : List<Short> {
val list = toList()
return list.reverse()
Collections.reverse(list)
return list
}
/** Copies all elements into a [[LinkedList]] */
@@ -245,7 +245,8 @@ public inline fun <in T, C: Collection<in T>> Iterable<T>.toCollection(result: C
*/
public inline fun <T> Iterable<T>.reverse() : List<T> {
val list = toList()
return list.reverse()
Collections.reverse(list)
return list
}
/** Copies all elements into a [[LinkedList]] */
@@ -229,7 +229,8 @@ public inline fun <in T, C: Collection<in T>> java.lang.Iterable<T>.toCollection
*/
public inline fun <T> java.lang.Iterable<T>.reverse() : List<T> {
val list = toList()
return list.reverse()
Collections.reverse(list)
return list
}
/** Copies all elements into a [[LinkedList]] */
@@ -106,6 +106,18 @@ public fun <T> java.lang.Iterable<T>.withIndices() : java.lang.Iterable<#(Int, T
}
}
public inline fun <in T: java.lang.Comparable<T>> java.lang.Iterable<T>.sort() : List<T> {
val list = toList()
java.util.Collections.sort(list)
return list
}
public inline fun <in T> java.lang.Iterable<T>.sort(comparator: java.util.Comparator<T>) : List<T> {
val list = toList()
java.util.Collections.sort(list, comparator)
return list
}
private class NumberedIterator<TT>(private val sourceIterator : java.util.Iterator<TT>) : java.util.Iterator<#(Int, TT)> {
private var nextIndex = 0
-20
View File
@@ -40,26 +40,6 @@ public inline fun <in T: java.lang.Comparable<T>> java.lang.Iterable<T>.toSorted
// List APIs
/**
* Reverses the order the elements into a list
*
* @includeFunctionBody ../../test/CollectionTest.kt reverse
*/
public inline fun <T> List<T>.reverse() : List<T> {
Collections.reverse(this)
return this
}
public inline fun <in T: java.lang.Comparable<T>> List<T>.sort() : List<T> {
Collections.sort(this)
return this
}
public inline fun <in T> List<T>.sort(comparator: java.util.Comparator<T>) : List<T> {
Collections.sort(this, comparator)
return this
}
/** Returns the List if its not null otherwise returns the empty list */
public inline fun <T> java.util.List<T>?.orEmpty() : java.util.List<T>
= if (this != null) this else Collections.emptyList<T>() as java.util.List<T>