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

IDL2K: drop garbage code, refactor to improve readability

Browse Source
This commit is contained in:
Sergey Mashkov
2017-03-17 17:43:07 +03:00
parent 1a4b9cb228
commit 23cbb83c75
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/idl2k/src/main/kotlin/render.kt
+8 -10
View File
@@ -202,10 +202,9 @@ fun Appendable.render(allTypes: Map<String, GenerateTraitOrClass>, enums: List<E
val superSignatures = superAttributes.map { it.signature } merge superFunctions.map { it.signature } val superSignatures = superAttributes.map { it.signature } merge superFunctions.map { it.signature }
iface.memberAttributes iface.memberAttributes
.filter { //it !in superAttributes .filter {
!it.static !it.static
&& (it.isVar || (it.isVal && superAttributesByName[it.name]?.hasNoVars() ?: true)) && (it.isVar || (it.isVal && superAttributesByName[it.name]?.hasNoVars() ?: true))
// && (iface.kind != GenerateDefinitionKind.INTERFACE && allSuperTypes.any { st -> st.kind == GenerateDefinitionKind.INTERFACE && st.memberAttributes.any { sa -> sa.signature == it.signature } })
} }
.map { it.dynamicIfUnknownType(allTypesAndEnums) } .map { it.dynamicIfUnknownType(allTypesAndEnums) }
.groupBy { it.name } .groupBy { it.name }
@@ -219,10 +218,6 @@ fun Appendable.render(allTypes: Map<String, GenerateTraitOrClass>, enums: List<E
else -> MemberModality.FINAL else -> MemberModality.FINAL
} }
if (iface.name == "XMLDocument" && attribute.name == "onabort") {
println()
}
if (attribute.name in superAttributesByName && attribute.signature !in superSignatures) { if (attribute.name in superAttributesByName && attribute.signature !in superSignatures) {
System.err.println("Property ${iface.name}.${attribute.name} has different type in super type(s) so will not be generated: ") System.err.println("Property ${iface.name}.${attribute.name} has different type in super type(s) so will not be generated: ")
for ((superTypeName, attributes) in allSuperTypes.map { it.name to it.memberAttributes.filter { it.name == attribute.name }.distinct() }) { for ((superTypeName, attributes) in allSuperTypes.map { it.name to it.memberAttributes.filter { it.name == attribute.name }.distinct() }) {
@@ -231,10 +226,9 @@ fun Appendable.render(allTypes: Map<String, GenerateTraitOrClass>, enums: List<E
} }
} }
} else if (modality == MemberModality.OVERRIDE } else if (modality == MemberModality.OVERRIDE
&& superAttributesByName[attribute.name].orEmpty().all { it.kind == attribute.kind } && attribute.kindNotChanged(superAttributesByName)
&& (iface.kind == GenerateDefinitionKind.INTERFACE && (iface.kind == GenerateDefinitionKind.INTERFACE || attribute.hasSuperImplementation(allSuperTypes))
|| allSuperTypes.none { st -> st.kind == GenerateDefinitionKind.INTERFACE && st.memberAttributes.any { it.signature == attribute.signature } } ) {
|| allSuperTypes.any { st -> st.kind != GenerateDefinitionKind.INTERFACE && st.memberAttributes.any { it.signature == attribute.signature } })) {
// then don't generate // then don't generate
} else { } else {
renderAttributeDeclarationAsProperty(attribute, renderAttributeDeclarationAsProperty(attribute,
@@ -288,6 +282,10 @@ fun Appendable.render(allTypes: Map<String, GenerateTraitOrClass>, enums: List<E
} }
} }
private fun GenerateAttribute.kindNotChanged(superAttributesByName: Map<String, List<GenerateAttribute>>) = superAttributesByName[name].orEmpty().all { it.kind == kind }
private fun GenerateAttribute.hasSuperImplementation(allSuperTypes: List<GenerateTraitOrClass>) = allSuperTypes.any { st -> st.kind != GenerateDefinitionKind.INTERFACE && st.memberAttributes.any { it.signature == signature } }
fun Appendable.renderBuilderFunction(dictionary: GenerateTraitOrClass, allSuperTypes: List<GenerateTraitOrClass>, allTypes: Set<String>) { fun Appendable.renderBuilderFunction(dictionary: GenerateTraitOrClass, allSuperTypes: List<GenerateTraitOrClass>, allTypes: Set<String>) {
val fields = (dictionary.memberAttributes + allSuperTypes.flatMap { it.memberAttributes }) val fields = (dictionary.memberAttributes + allSuperTypes.flatMap { it.memberAttributes })
.distinctBy { it.signature } .distinctBy { it.signature }