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

Revert "Support common metadata in kotlinx-metadata"

Browse Source 
This reverts commit f9cc443e4f.
This commit is contained in:
Nikolay Krasko
2022-02-16 22:31:26 +03:00
parent f9cc443e4f
commit 03cb9942e6
4 changed files with 15 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/kotlinx-metadata/jvm/src/kotlinx/metadata/jvm/impl/JvmMetadataExtensions.kt
+1 -6
View File
@@ -298,12 +298,7 @@ internal class JvmMetadataExtensions : MetadataExtensions {
override fun createPackageExtension(): KmPackageExtension = JvmPackageExtension()
override fun createModuleFragmentExtensions(): KmModuleFragmentExtension =
object : KmModuleFragmentExtension {
override val type: KmExtensionType = KmExtensionType(KmModuleFragmentExtension::class)
override fun accept(visitor: KmModuleFragmentExtensionVisitor) {
}
}
error("metadata-jvm doesn't have any extensions for module fragment!")
override fun createFunctionExtension(): KmFunctionExtension = JvmFunctionExtension()
libraries/kotlinx-metadata/src/kotlinx/metadata/internal/common/KotlinCommonMetadata.kt
-44
View File
@@ -1,44 +0,0 @@
/*
* Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package kotlinx.metadata.internal.common
import kotlinx.metadata.KmModuleFragment
import kotlinx.metadata.KmModuleFragmentVisitor
import kotlinx.metadata.impl.accept
import org.jetbrains.kotlin.metadata.ProtoBuf
import org.jetbrains.kotlin.metadata.builtins.readBuiltinsPackageFragment
import org.jetbrains.kotlin.metadata.deserialization.NameResolverImpl
import java.io.ByteArrayInputStream
class KotlinCommonMetadata private constructor(private val proto: ProtoBuf.PackageFragment) {
fun toKmModuleFragment(): KmModuleFragment =
KmModuleFragment().apply(this::accept)
class Writer : KmModuleFragmentVisitor() {
// TODO
}
fun accept(v: KmModuleFragmentVisitor) {
val strings = NameResolverImpl(proto.strings, proto.qualifiedNames)
if (proto.hasPackage()) {
v.visitPackage()?.let { proto.`package`.accept(it, strings) }
}
for (klass in proto.class_List) {
v.visitClass()?.let { klass.accept(it, strings) }
}
v.visitEnd()
}
companion object {
@JvmStatic
fun read(bytes: ByteArray): KotlinCommonMetadata? {
val (proto, _) = ByteArrayInputStream(bytes).readBuiltinsPackageFragment()
if (proto == null) return null
return KotlinCommonMetadata(proto)
}
}
}