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

[klib] Support externals in pretty-printer

Browse Source
This commit is contained in:
Ilya Matveev
2018-02-12 17:04:44 +07:00
committed by ilmat192
parent cbee66dcbe
commit 709fe7b0af
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/PrettyPrinter.kt
+11 -7
View File
@@ -226,12 +226,13 @@ class PackageFragmentPrinter(val packageFragment: KonanLinkData.PackageFragment,
val visibility = Flags.VISIBILITY.get(flags).asString() val visibility = Flags.VISIBILITY.get(flags).asString()
val modality = Flags.MODALITY.get(flags).asString(isInterface) val modality = Flags.MODALITY.get(flags).asString(isInterface)
val isInline = Flags.IS_INLINE.asString(flags) val isInline = Flags.IS_INLINE.asString(flags)
val isExternal = Flags.IS_EXTERNAL_FUNCTION.asString(flags)
val receiverType = receiverType() val receiverType = receiverType()
val annotations = annotationsToString(getExtension(KonanSerializerProtocol.functionAnnotation), "\n") val annotations = annotationsToString(getExtension(KonanSerializerProtocol.functionAnnotation), "\n")
val typeParameters = typeParameterList.joinToString("<", "> ") { it.asString() } val typeParameters = typeParameterList.joinToString("<", "> ") { it.asString() }
val valueParameters = valueParameterList.joinToString(", ", "(", ")") { it.asString() } val valueParameters = valueParameterList.joinToString(", ", "(", ")") { it.asString() }
val returnType = returnType() val returnType = returnType()
append("$annotations$Indent$modality$visibility${isInline}fun $typeParameters$receiverType$name$valueParameters$returnType\n") append("$annotations$Indent$isExternal$modality$visibility${isInline}fun $typeParameters$receiverType$name$valueParameters$returnType\n")
} }
if (hasTypeTable()) TypeTables.pop() if (hasTypeTable()) TypeTables.pop()
return result return result
@@ -244,9 +245,10 @@ class PackageFragmentPrinter(val packageFragment: KonanLinkData.PackageFragment,
val isVar = Flags.IS_VAR.asString(flags) val isVar = Flags.IS_VAR.asString(flags)
val modality = Flags.MODALITY.get(flags).asString(isInterface) val modality = Flags.MODALITY.get(flags).asString(isInterface)
val visibility = Flags.VISIBILITY.get(flags).asString() val visibility = Flags.VISIBILITY.get(flags).asString()
val isExternal = Flags.IS_EXTERNAL_PROPERTY.asString(flags)
val returnType = returnType(TypeTables.peek()).asString() val returnType = returnType(TypeTables.peek()).asString()
val annotations = annotationsToString(getExtension(KonanSerializerProtocol.propertyAnnotation), "\n") val annotations = annotationsToString(getExtension(KonanSerializerProtocol.propertyAnnotation), "\n")
append("$annotations$Indent$modality$visibility$isVar$name: $returnType\n") append("$annotations$Indent$isExternal$modality$visibility$isVar$name: $returnType\n")
} }
//-------------------------------------------------------------------------// //-------------------------------------------------------------------------//
@@ -456,11 +458,13 @@ class PackageFragmentPrinter(val packageFragment: KonanLinkData.PackageFragment,
private fun Flags.BooleanFlagField.asString(flags: Int) = private fun Flags.BooleanFlagField.asString(flags: Int) =
when(this) { when(this) {
IS_INLINE -> if (Flags.IS_INLINE .get(flags)) "inline " else "" IS_INLINE -> if (Flags.IS_INLINE .get(flags)) "inline " else ""
IS_VAR -> if (Flags.IS_VAR .get(flags)) "var " else "val " IS_VAR -> if (Flags.IS_VAR .get(flags)) "var " else "val "
IS_CROSSINLINE -> if (Flags.IS_CROSSINLINE.get(flags)) "crossinline " else "" IS_CROSSINLINE -> if (Flags.IS_CROSSINLINE .get(flags)) "crossinline " else ""
IS_NOINLINE -> if (Flags.IS_NOINLINE .get(flags)) "noinline " else "" IS_NOINLINE -> if (Flags.IS_NOINLINE .get(flags)) "noinline " else ""
IS_INNER -> if (Flags.IS_INNER .get(flags)) "inner " else "" IS_INNER -> if (Flags.IS_INNER .get(flags)) "inner " else ""
IS_EXTERNAL_FUNCTION -> if (Flags.IS_EXTERNAL_FUNCTION.get(flags)) "external " else ""
IS_EXTERNAL_PROPERTY -> if (Flags.IS_EXTERNAL_PROPERTY.get(flags)) "external " else ""
else -> "unknown flag" else -> "unknown flag"
} }