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

added java.lang.Comparable to JavaTypeTransformer

Browse Source
This commit is contained in:
Svetlana Isakova
2012-07-20 16:35:53 +04:00
parent 084566aac4
commit 6f8f151db5
4 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaTypeTransformer.java
+1 -1
View File
@@ -256,7 +256,7 @@ public class JavaTypeTransformer {
classDescriptorMap.put(new FqName("java.lang.CharSequence"), JetStandardLibrary.getInstance().getCharSequence()); classDescriptorMap.put(new FqName("java.lang.CharSequence"), JetStandardLibrary.getInstance().getCharSequence());
classDescriptorMap.put(new FqName("java.lang.Throwable"), JetStandardLibrary.getInstance().getThrowable()); classDescriptorMap.put(new FqName("java.lang.Throwable"), JetStandardLibrary.getInstance().getThrowable());
classDescriptorMap.put(new FqName("java.lang.Number"), JetStandardLibrary.getInstance().getNumber()); classDescriptorMap.put(new FqName("java.lang.Number"), JetStandardLibrary.getInstance().getNumber());
classDescriptorMap.put(new FqName("java.lang.Comparable"), JetStandardLibrary.getInstance().getComparable());
} }
return classDescriptorMap; return classDescriptorMap;
} }
compiler/testData/diagnostics/tests/regressions/kt335.336.kt
+1 -2
View File
@@ -2,9 +2,8 @@
// KT-335 Type inference fails on Collections.sort // KT-335 Type inference fails on Collections.sort
import java.util.* import java.util.*
import java.lang.Comparable as Comparable
fun <T : java.lang.Comparable<T>> List<T>.sort() { fun <T : Comparable<T>> List<T>.sort() {
Collections.sort(this) // Error here Collections.sort(this) // Error here
} }
libraries/stdlib/src/kotlin/JLangIterablesSpecial.kt
+1 -1
View File
@@ -109,7 +109,7 @@ public fun <T> java.lang.Iterable<T>.withIndices(): java.util.List<#(Int, T)> {
return answer return answer
} }
public inline fun <in T: java.lang.Comparable<T>> java.lang.Iterable<T>.sort() : List<T> { public inline fun <in T: Comparable<T>> java.lang.Iterable<T>.sort() : List<T> {
val list = toList() val list = toList()
java.util.Collections.sort(list) java.util.Collections.sort(list)
return list return list
libraries/stdlib/src/kotlin/JUtil.kt
+2 -2
View File
@@ -33,9 +33,9 @@ public inline fun <T> java.util.Collection<T>?.orEmpty() : Collection<T>
/** TODO these functions don't work when they generate the Array<T> versions when they are in JLIterables */ /** TODO these functions don't work when they generate the Array<T> versions when they are in JLIterables */
public inline fun <in T: java.lang.Comparable<T>> java.lang.Iterable<T>.toSortedList() : List<T> = toList().sort() public inline fun <in T: Comparable<T>> java.lang.Iterable<T>.toSortedList() : List<T> = toList().sort()
public inline fun <in T: java.lang.Comparable<T>> java.lang.Iterable<T>.toSortedList(comparator: java.util.Comparator<T>) : List<T> = toList().sort(comparator) public inline fun <in T: Comparable<T>> java.lang.Iterable<T>.toSortedList(comparator: java.util.Comparator<T>) : List<T> = toList().sort(comparator)
// List APIs // List APIs