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

IDL2K: rename trait to interface, render NoInterfaceObject as native interface

Browse Source
This commit is contained in:
Sergey Mashkov
2016-10-14 16:10:49 +03:00
parent 5e01d4c993
commit 44335901c5
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/idl2k/src/main/kotlin/gen.kt
+4 -3
View File
@@ -80,10 +80,11 @@ fun generateAttribute(putNoImpl: Boolean, repository: Repository, attribute: Att
private fun InterfaceDefinition.superTypes(repository: Repository) = superTypes.map { repository.interfaces[it] }.filterNotNull()
private fun resolveDefinitionKind(repository: Repository, iface: InterfaceDefinition, constructors: List<ExtendedAttribute> = iface.findConstructors()): GenerateDefinitionKind =
when {
iface.extendedAttributes.any { it.call == "NoInterfaceObject" } -> GenerateDefinitionKind.INTERFACE
constructors.isNotEmpty() || iface.superTypes(repository).any { resolveDefinitionKind(repository, it) == GenerateDefinitionKind.CLASS } -> {
GenerateDefinitionKind.CLASS
}
iface.callback -> GenerateDefinitionKind.TRAIT
iface.callback -> GenerateDefinitionKind.INTERFACE
else -> GenerateDefinitionKind.ABSTRACT_CLASS
}
@@ -169,7 +170,7 @@ fun superOrPrimaryConstructorCall(constructorAsFunction: GenerateFunction, super
fun mapUnionType(it: UnionType) = GenerateTraitOrClass(
name = it.name,
namespace = it.namespace,
kind = GenerateDefinitionKind.TRAIT,
kind = GenerateDefinitionKind.INTERFACE,
superTypes = emptyList(),
memberAttributes = emptyList(),
memberFunctions = emptyList(),
@@ -182,7 +183,7 @@ fun mapUnionType(it: UnionType) = GenerateTraitOrClass(
fun generateUnionTypeTraits(allUnionTypes: Sequence<UnionType>): Sequence<GenerateTraitOrClass> = allUnionTypes.map(::mapUnionType)
fun mapDefinitions(repository: Repository, definitions: Iterable<InterfaceDefinition>) =
definitions.filter { "NoInterfaceObject" !in it.extendedAttributes.map { it.call } }.map { generateTrait(repository, it) }
definitions.map { generateTrait(repository, it) }
fun generateUnions(ifaces: List<GenerateTraitOrClass>, typedefs: Iterable<TypedefDefinition>): GenerateUnionTypes {
val declaredTypes = ifaces.associateBy { it.name }
libraries/tools/idl2k/src/main/kotlin/model.kt
+1 -1
View File
@@ -58,7 +58,7 @@ enum class NativeGetterOrSetter {
}
enum class GenerateDefinitionKind {
TRAIT,
INTERFACE,
CLASS,
ABSTRACT_CLASS
}
libraries/tools/idl2k/src/main/kotlin/render.kt
+2 -2
View File
@@ -119,7 +119,7 @@ fun Appendable.render(allTypes: Map<String, GenerateTraitOrClass>, typeNamesToUn
when (iface.kind) {
GenerateDefinitionKind.CLASS -> append("open class ")
GenerateDefinitionKind.ABSTRACT_CLASS -> append("abstract class ")
GenerateDefinitionKind.TRAIT -> append("interface ")
GenerateDefinitionKind.INTERFACE -> append("interface ")
}
val allSuperTypes = iface.allSuperTypes(allTypes)
@@ -177,7 +177,7 @@ fun Appendable.render(allTypes: Map<String, GenerateTraitOrClass>, typeNamesToUn
renderAttributeDeclarationAsProperty(arg,
modality = modality,
commented = arg.isCommented(iface.name),
omitDefaults = iface.kind == GenerateDefinitionKind.TRAIT,
omitDefaults = iface.kind == GenerateDefinitionKind.INTERFACE,
level = 1
)
}