diff --git a/kotlin-native/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/DeclarationPrinter.kt b/kotlin-native/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/DeclarationPrinter.kt index 6ebddfb5f0a..4e345c6a1af 100644 --- a/kotlin-native/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/DeclarationPrinter.kt +++ b/kotlin-native/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/DeclarationPrinter.kt @@ -5,10 +5,10 @@ import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.descriptors.impl.DeclarationDescriptorVisitorEmptyBodies import org.jetbrains.kotlin.utils.Printer -class DeclarationPrinter( +internal class DeclarationPrinter( out: Appendable, private val headerRenderer: DeclarationHeaderRenderer, - private val signatureRenderer: IdSignatureRenderer + private val signatureRenderer: KlibSignatureRenderer ) { private val printer = Printer(out, 1, " ") diff --git a/kotlin-native/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/DefaultIdSignatureRenderer.kt b/kotlin-native/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/DefaultKlibSignatureRenderer.kt similarity index 89% rename from kotlin-native/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/DefaultIdSignatureRenderer.kt rename to kotlin-native/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/DefaultKlibSignatureRenderer.kt index a477f0eda62..089db974215 100644 --- a/kotlin-native/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/DefaultIdSignatureRenderer.kt +++ b/kotlin-native/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/DefaultKlibSignatureRenderer.kt @@ -7,7 +7,7 @@ import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.ir.util.render -class DefaultIdSignatureRenderer(private val prefix: String? = null) : IdSignatureRenderer { +internal class DefaultKlibSignatureRenderer(private val prefix: String? = null) : KlibSignatureRenderer { private val idSignaturer = KonanIdSignaturer(KonanManglerDesc) override fun render(descriptor: DeclarationDescriptor): String? { diff --git a/kotlin-native/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/IdSignatureRenderer.kt b/kotlin-native/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/KlibSignatureRenderer.kt similarity index 73% rename from kotlin-native/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/IdSignatureRenderer.kt rename to kotlin-native/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/KlibSignatureRenderer.kt index cbbae6b8617..8d49af608cb 100644 --- a/kotlin-native/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/IdSignatureRenderer.kt +++ b/kotlin-native/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/KlibSignatureRenderer.kt @@ -2,11 +2,11 @@ package org.jetbrains.kotlin.cli.klib import org.jetbrains.kotlin.descriptors.DeclarationDescriptor -interface IdSignatureRenderer { +internal interface KlibSignatureRenderer { fun render(descriptor: DeclarationDescriptor): String? companion object { - val NO_SIGNATURE = object : IdSignatureRenderer { + val NO_SIGNATURE = object : KlibSignatureRenderer { override fun render(descriptor: DeclarationDescriptor): String? = null } } diff --git a/kotlin-native/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/SignaturePrinter.kt b/kotlin-native/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/SignaturePrinter.kt index 50dd51edc47..8b82690700b 100644 --- a/kotlin-native/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/SignaturePrinter.kt +++ b/kotlin-native/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/SignaturePrinter.kt @@ -5,9 +5,9 @@ import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.descriptors.impl.DeclarationDescriptorVisitorEmptyBodies import org.jetbrains.kotlin.utils.Printer -class SignaturePrinter( +internal class SignaturePrinter( out: Appendable, - private val signatureRenderer: IdSignatureRenderer + private val signatureRenderer: KlibSignatureRenderer ) { private val printer = Printer(out) diff --git a/kotlin-native/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/main.kt b/kotlin-native/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/main.kt index 08385bcbcfa..1d2f856d452 100644 --- a/kotlin-native/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/main.kt +++ b/kotlin-native/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/main.kt @@ -166,7 +166,7 @@ class Library(val libraryNameOrPath: String, val requestedRepository: String?, v fun contents(output: Appendable, printSignatures: Boolean) { val module = loadModule() - val signatureRenderer = if (printSignatures) DefaultIdSignatureRenderer("// ID signature: ") else IdSignatureRenderer.NO_SIGNATURE + val signatureRenderer = if (printSignatures) DefaultKlibSignatureRenderer("// ID signature: ") else KlibSignatureRenderer.NO_SIGNATURE val printer = DeclarationPrinter(output, DefaultDeclarationHeaderRenderer, signatureRenderer) printer.print(module) @@ -174,7 +174,7 @@ class Library(val libraryNameOrPath: String, val requestedRepository: String?, v fun signatures(output: Appendable) { val module = loadModule() - val printer = SignaturePrinter(output, DefaultIdSignatureRenderer()) + val printer = SignaturePrinter(output, DefaultKlibSignatureRenderer()) printer.print(module) }