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

[klib] Support inner classes in pretty-printer

Browse Source
This commit is contained in:
Ilya Matveev
2018-02-12 16:56:21 +07:00
committed by ilmat192
parent 83ce6142a1
commit cbee66dcbe
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/PrettyPrinter.kt
+3 -1
View File
@@ -145,6 +145,7 @@ class PackageFragmentPrinter(val packageFragment: KonanLinkData.PackageFragment,
val classKind = Flags.CLASS_KIND.get(flags).asString() val classKind = Flags.CLASS_KIND.get(flags).asString()
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 inner = Flags.IS_INNER.asString(flags)
val typeParameters = typeParameterList val typeParameters = typeParameterList
.joinToString("<", "> ") { it.asString() } .joinToString("<", "> ") { it.asString() }
.let { if (it.isEmpty()) " " else it } .let { if (it.isEmpty()) " " else it }
@@ -160,7 +161,7 @@ class PackageFragmentPrinter(val packageFragment: KonanLinkData.PackageFragment,
when { when {
isEnumEntry -> append("$annotations$Indent$className") isEnumEntry -> append("$annotations$Indent$className")
else -> append("$annotations$Indent$modality$visibility$classKind$className$typeParameters$primaryConstructor$supertypes") else -> append("$annotations$Indent$modality$visibility$inner$classKind$className$typeParameters$primaryConstructor$supertypes")
} }
buildBody { buildBody {
@@ -459,6 +460,7 @@ class PackageFragmentPrinter(val packageFragment: KonanLinkData.PackageFragment,
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 ""
else -> "unknown flag" else -> "unknown flag"
} }