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

[Native] Rename o.j.k.cli.klib.IdSignatureRenderer to avoid name clash with o.j.k.ir.util.IdSignatureRenderer

Browse Source 
^KT-59486
This commit is contained in:
Dmitriy Dolovov
2023-06-21 16:51:12 +02:00
committed by Space Team
parent 4c0583e415
commit a17ce79088
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kotlin-native/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/DeclarationPrinter.kt
+2 -2
View File
@@ -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, " ")
kotlin-native/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/DefaultIdSignatureRenderer.kt → kotlin-native/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/DefaultKlibSignatureRenderer.kt
+1 -1
View File
@@ -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? {
kotlin-native/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/IdSignatureRenderer.kt → kotlin-native/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/KlibSignatureRenderer.kt
+2 -2
View File
@@ -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
}
}
kotlin-native/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/SignaturePrinter.kt
+2 -2
View File
@@ -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)
kotlin-native/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/main.kt
+2 -2
View File
@@ -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)
}