made Map covariant on second parameter

This commit is contained in:
Svetlana Isakova
2012-09-19 15:21:20 +04:00
parent 3dd9c6ab10
commit 0ff9d95704
3 changed files with 5 additions and 5 deletions
@@ -136,14 +136,14 @@ fun inheritedExtensionProperties(properties: Collection<KProperty>): Map<KClass,
// TODO for some reason the SortedMap causes kotlin to freak out a little :)
fun extensionFunctions(functions: Collection<KFunction>): Map<KClass, List<KFunction>> {
val map = TreeMap<KClass, List<KFunction>>()
val map = TreeMap<KClass, MutableList<KFunction>>()
functions.filter{ it.extensionClass != null }.groupByTo(map){ it.extensionClass!! }
return map
}
// TODO for some reason the SortedMap causes kotlin to freak out a little :)
fun extensionProperties(properties: Collection<KProperty>): Map<KClass, List<KProperty>> {
val map = TreeMap<KClass, List<KProperty>>()
val map = TreeMap<KClass, MutableList<KProperty>>()
properties.filter{ it.extensionClass != null }.groupByTo(map){ it.extensionClass!! }
return map
}
@@ -1037,7 +1037,7 @@ class KPackage(model: KModel, val descriptor: NamespaceDescriptor,
}
fun groupClassMap(): Map<String, List<KClass>> {
return classes.groupByTo(TreeMap<String, List<KClass>>()){it.group}
return classes.groupByTo(TreeMap<String, MutableList<KClass>>()){it.group}
}
fun packageFunctions() = functions.filter{ it.extensionClass == null }