Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
硅谷海盗
kotlin
提交
b66f5c81
K
kotlin
项目概览
硅谷海盗
/
kotlin
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
K
kotlin
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
b66f5c81
编写于
1月 18, 2021
作者:
P
Pavel Kirpichenkov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Drop type aliases for JS and KLIB string tables
They used to use the same approximation logic anyway ^KT-20996
上级
2f3f75b5
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
11 addition
and
40 deletion
+11
-40
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/metadata/KlibMetadataSerializer.kt
...d/common/serialization/metadata/KlibMetadataSerializer.kt
+2
-1
compiler/util-klib-metadata/src/org/jetbrains/kotlin/library/metadata/KlibMetadataStringTable.kt
...brains/kotlin/library/metadata/KlibMetadataStringTable.kt
+0
-10
js/js.serializer/src/org/jetbrains/kotlin/serialization/js/JavaScriptStringTable.kt
...etbrains/kotlin/serialization/js/JavaScriptStringTable.kt
+0
-21
js/js.serializer/src/org/jetbrains/kotlin/serialization/js/KotlinJavascriptSerializerExtension.kt
...n/serialization/js/KotlinJavascriptSerializerExtension.kt
+2
-1
libraries/kotlinx-metadata/klib/src/kotlinx/metadata/klib/KlibModuleMetadata.kt
...data/klib/src/kotlinx/metadata/klib/KlibModuleMetadata.kt
+4
-4
libraries/kotlinx-metadata/klib/src/kotlinx/metadata/klib/impl/klibWriters.kt
...tadata/klib/src/kotlinx/metadata/klib/impl/klibWriters.kt
+3
-3
未找到文件。
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/metadata/KlibMetadataSerializer.kt
浏览文件 @
b66f5c81
...
...
@@ -20,6 +20,7 @@ import org.jetbrains.kotlin.name.ClassId
import
org.jetbrains.kotlin.name.FqName
import
org.jetbrains.kotlin.resolve.descriptorUtil.fqNameSafe
import
org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter
import
org.jetbrains.kotlin.serialization.ApproximatingStringTable
import
org.jetbrains.kotlin.serialization.DescriptorSerializer
import
org.jetbrains.kotlin.serialization.StringTableImpl
import
org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedClassDescriptor
...
...
@@ -51,7 +52,7 @@ abstract class KlibMetadataSerializer(
val
extension
=
KlibMetadataSerializerExtension
(
languageVersionSettings
,
metadataVersion
,
KlibMetadata
StringTable
(),
Approximating
StringTable
(),
allowErrorTypes
)
return
SerializerContext
(
...
...
compiler/util-klib-metadata/src/org/jetbrains/kotlin/library/metadata/KlibMetadataStringTable.kt
已删除
100644 → 0
浏览文件 @
2f3f75b5
/*
* Copyright 2010-2019 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
org.jetbrains.kotlin.backend.common.serialization.metadata
import
org.jetbrains.kotlin.serialization.ApproximatingStringTable
typealias
KlibMetadataStringTable
=
ApproximatingStringTable
js/js.serializer/src/org/jetbrains/kotlin/serialization/js/JavaScriptStringTable.kt
已删除
100644 → 0
浏览文件 @
2f3f75b5
/*
* Copyright 2010-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org.jetbrains.kotlin.serialization.js
import
org.jetbrains.kotlin.serialization.ApproximatingStringTable
typealias
JavaScriptStringTable
=
ApproximatingStringTable
js/js.serializer/src/org/jetbrains/kotlin/serialization/js/KotlinJavascriptSerializerExtension.kt
浏览文件 @
b66f5c81
...
...
@@ -26,6 +26,7 @@ import org.jetbrains.kotlin.metadata.serialization.MutableVersionRequirementTabl
import
org.jetbrains.kotlin.psi.KtFile
import
org.jetbrains.kotlin.resolve.DescriptorUtils
import
org.jetbrains.kotlin.resolve.source.PsiSourceFile
import
org.jetbrains.kotlin.serialization.ApproximatingStringTable
import
org.jetbrains.kotlin.serialization.DescriptorSerializer
import
org.jetbrains.kotlin.serialization.KotlinSerializerExtensionBase
import
org.jetbrains.kotlin.types.FlexibleType
...
...
@@ -35,7 +36,7 @@ class KotlinJavascriptSerializerExtension(
private
val
languageVersionSettings
:
LanguageVersionSettings
,
override
val
metadataVersion
:
BinaryVersion
)
:
KotlinSerializerExtensionBase
(
JsSerializerProtocol
)
{
override
val
stringTable
=
JavaScript
StringTable
()
override
val
stringTable
=
Approximating
StringTable
()
override
fun
serializeFlexibleType
(
flexibleType
:
FlexibleType
,
lowerProto
:
ProtoBuf
.
Type
.
Builder
,
upperProto
:
ProtoBuf
.
Type
.
Builder
)
{
lowerProto
.
flexibleTypeCapabilitiesId
=
stringTable
.
getStringIndex
(
DynamicTypeDeserializer
.
id
)
...
...
libraries/kotlinx-metadata/klib/src/kotlinx/metadata/klib/KlibModuleMetadata.kt
浏览文件 @
b66f5c81
...
...
@@ -10,11 +10,11 @@ import kotlinx.metadata.KmModuleFragment
import
kotlinx.metadata.impl.WriteContext
import
kotlinx.metadata.impl.accept
import
kotlinx.metadata.klib.impl.*
import
org.jetbrains.kotlin.backend.common.serialization.metadata.KlibMetadataStringTable
import
org.jetbrains.kotlin.library.metadata.parseModuleHeader
import
org.jetbrains.kotlin.library.metadata.parsePackageFragment
import
org.jetbrains.kotlin.metadata.ProtoBuf
import
org.jetbrains.kotlin.metadata.deserialization.NameResolverImpl
import
org.jetbrains.kotlin.serialization.ApproximatingStringTable
/**
* Allows to modify the way fragments of the single package are read by [KlibModuleMetadata.read].
...
...
@@ -120,12 +120,12 @@ class KlibModuleMetadata(
)
val
groupedProtos
=
groupedFragments
.
mapValues
{
(
_
,
fragments
)
->
fragments
.
map
{
val
c
=
WriteContext
(
KlibMetadata
StringTable
(),
listOf
(
reverseIndex
))
KlibModuleFragmentWriter
(
c
.
strings
as
KlibMetadata
StringTable
,
c
.
contextExtensions
).
also
(
it
::
accept
).
write
()
val
c
=
WriteContext
(
Approximating
StringTable
(),
listOf
(
reverseIndex
))
KlibModuleFragmentWriter
(
c
.
strings
as
Approximating
StringTable
,
c
.
contextExtensions
).
also
(
it
::
accept
).
write
()
}
}
// This context and string table is only required for module-level annotations.
val
c
=
WriteContext
(
KlibMetadata
StringTable
(),
listOf
(
reverseIndex
))
val
c
=
WriteContext
(
Approximating
StringTable
(),
listOf
(
reverseIndex
))
return
SerializedKlibMetadata
(
header
.
writeHeader
(
c
).
build
().
toByteArray
(),
groupedProtos
.
map
{
it
.
value
.
map
(
ProtoBuf
.
PackageFragment
::
toByteArray
)
},
...
...
libraries/kotlinx-metadata/klib/src/kotlinx/metadata/klib/impl/klibWriters.kt
浏览文件 @
b66f5c81
...
...
@@ -7,9 +7,9 @@ package kotlinx.metadata.klib.impl
import
kotlinx.metadata.impl.*
import
kotlinx.metadata.klib.KlibSourceFile
import
org.jetbrains.kotlin.backend.common.serialization.metadata.KlibMetadataStringTable
import
org.jetbrains.kotlin.library.metadata.KlibMetadataProtoBuf
import
org.jetbrains.kotlin.metadata.ProtoBuf
import
org.jetbrains.kotlin.serialization.ApproximatingStringTable
class
ReverseSourceFileIndexWriteExtension
:
WriteContextExtension
{
private
val
filesReverseIndex
=
mutableMapOf
<
KlibSourceFile
,
Int
>()
...
...
@@ -26,7 +26,7 @@ class ReverseSourceFileIndexWriteExtension : WriteContextExtension {
}
class
KlibModuleFragmentWriter
(
stringTable
:
KlibMetadata
StringTable
,
stringTable
:
Approximating
StringTable
,
contextExtensions
:
List
<
WriteContextExtension
>
=
emptyList
()
)
:
ModuleFragmentWriter
(
stringTable
,
contextExtensions
)
{
...
...
@@ -36,7 +36,7 @@ class KlibModuleFragmentWriter(
override
fun
visitEnd
()
{
// TODO: This should be moved to ModuleFragmentWriter.
val
(
strings
,
qualifiedNames
)
=
(
c
.
strings
as
KlibMetadata
StringTable
).
buildProto
()
val
(
strings
,
qualifiedNames
)
=
(
c
.
strings
as
Approximating
StringTable
).
buildProto
()
t
.
strings
=
strings
t
.
qualifiedNames
=
qualifiedNames
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录