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

IDL2K better results stability

Browse Source
This commit is contained in:
Sergey Mashkov
2015-06-15 20:52:27 +03:00
parent 1a5e6634e2
commit 28f228ccc0
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/idl2k/src/main/kotlin/model.kt
-2
View File
@@ -16,8 +16,6 @@
package org.jetbrains.idl2k package org.jetbrains.idl2k
import java.util.HashSet
data class NamedValue<V>(val name: String, val value: V) data class NamedValue<V>(val name: String, val value: V)
data class Repository( data class Repository(
libraries/tools/idl2k/src/main/kotlin/typeMappings.kt
+2 -2
View File
@@ -46,10 +46,10 @@ private val typeMapper = mapOf(
) )
fun GenerateTraitOrClass.allSuperTypes(all: Map<String, GenerateTraitOrClass>) = HashSet<GenerateTraitOrClass>().let { result -> allSuperTypesImpl(listOf(this), all, result); result.toList() } fun GenerateTraitOrClass.allSuperTypes(all: Map<String, GenerateTraitOrClass>) = LinkedHashSet<GenerateTraitOrClass>().let { result -> allSuperTypesImpl(listOf(this), all, result); result.toList() }
tailRecursive tailRecursive
fun allSuperTypesImpl(roots: List<GenerateTraitOrClass>, all: Map<String, GenerateTraitOrClass>, result: HashSet<GenerateTraitOrClass>) { fun allSuperTypesImpl(roots: List<GenerateTraitOrClass>, all: Map<String, GenerateTraitOrClass>, result: MutableSet<GenerateTraitOrClass>) {
if (roots.isNotEmpty()) { if (roots.isNotEmpty()) {
allSuperTypesImpl(roots.flatMap { it.superTypes }.map { all[it] }.filterNotNull().filter { result.add(it) }, all, result) allSuperTypesImpl(roots.flatMap { it.superTypes }.map { all[it] }.filterNotNull().filter { result.add(it) }, all, result)
} }