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

IDL2K: map array literal

Browse Source
This commit is contained in:
Sergey Mashkov
2016-10-13 21:52:48 +03:00
parent df21b8bb7e
commit 3c60e73d19
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/idl2k/src/main/kotlin/gen.kt
+15 -3
View File
@@ -14,10 +14,12 @@ fun generateFunction(repository: Repository, function: Operation, functionName:
name = functionName,
returnType = mapType(repository, function.returnType).let { mapped -> if (nativeGetterOrSetter == NativeGetterOrSetter.GETTER) mapped.toNullableIfNonPrimitive() else mapped },
arguments = function.parameters.map {
val mappedType = mapType(repository, it.type)
GenerateAttribute(
name = it.name,
type = mapType(repository, it.type),
initializer = it.defaultValue,
type = mappedType,
initializer = mapLiteral(it.defaultValue, mappedType),
getterSetterNoImpl = false,
override = false,
kind = AttributeKind.ARGUMENT,
@@ -67,7 +69,7 @@ fun generateFunctions(repository: Repository, function: Operation): List<Generat
fun generateAttribute(putNoImpl: Boolean, repository: Repository, attribute: Attribute): GenerateAttribute =
GenerateAttribute(attribute.name,
type = mapType(repository, attribute.type),
initializer = attribute.defaultValue,
initializer = mapLiteral(attribute.defaultValue, mapType(repository, attribute.type)),
getterSetterNoImpl = putNoImpl,
kind = if (attribute.readOnly) AttributeKind.VAL else AttributeKind.VAR,
override = false,
@@ -215,3 +217,13 @@ fun generateUnions(ifaces: List<GenerateTraitOrClass>, typedefs: Iterable<Typede
typedefsMarkersMap = typedefsMarkersMap
)
}
private fun mapLiteral(literal: String?, expectedType: Type = DynamicType) = when (literal) {
"[]" -> when {
expectedType == DynamicType -> "arrayOf<dynamic>()"
expectedType is AnyType -> "arrayOf<dynamic>()"
expectedType is UnionType -> "arrayOf<dynamic>()"
else -> "arrayOf()"
}
else -> literal
}