Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
硅谷海盗
kotlin
提交
5d19ac16
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,发现更多精彩内容 >>
提交
5d19ac16
编写于
2月 05, 2021
作者:
D
Dmitriy Dolovov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[Commonizer] Drop useless CirPackageNode.moduleName property
上级
c6756762
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
7 addition
and
12 deletion
+7
-12
native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/CirNode.kt
...rains/kotlin/descriptors/commonizer/mergedtree/CirNode.kt
+0
-1
native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/CirPackageNode.kt
...otlin/descriptors/commonizer/mergedtree/CirPackageNode.kt
+1
-2
native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/CirTreeMerger.kt
...kotlin/descriptors/commonizer/mergedtree/CirTreeMerger.kt
+3
-4
native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/nodeBuilders.kt
.../kotlin/descriptors/commonizer/mergedtree/nodeBuilders.kt
+3
-5
未找到文件。
native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/CirNode.kt
浏览文件 @
5d19ac16
...
@@ -5,7 +5,6 @@
...
@@ -5,7 +5,6 @@
package
org.jetbrains.kotlin.descriptors.commonizer.mergedtree
package
org.jetbrains.kotlin.descriptors.commonizer.mergedtree
import
gnu.trove.THashMap
import
org.jetbrains.kotlin.descriptors.commonizer.cir.CirClassifier
import
org.jetbrains.kotlin.descriptors.commonizer.cir.CirClassifier
import
org.jetbrains.kotlin.descriptors.commonizer.cir.CirDeclaration
import
org.jetbrains.kotlin.descriptors.commonizer.cir.CirDeclaration
import
org.jetbrains.kotlin.descriptors.commonizer.cir.CirLiftedUpDeclaration
import
org.jetbrains.kotlin.descriptors.commonizer.cir.CirLiftedUpDeclaration
...
...
native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/CirPackageNode.kt
浏览文件 @
5d19ac16
...
@@ -15,8 +15,7 @@ import org.jetbrains.kotlin.storage.NullableLazyValue
...
@@ -15,8 +15,7 @@ import org.jetbrains.kotlin.storage.NullableLazyValue
class
CirPackageNode
(
class
CirPackageNode
(
override
val
targetDeclarations
:
CommonizedGroup
<
CirPackage
>,
override
val
targetDeclarations
:
CommonizedGroup
<
CirPackage
>,
override
val
commonDeclaration
:
NullableLazyValue
<
CirPackage
>,
override
val
commonDeclaration
:
NullableLazyValue
<
CirPackage
>,
override
val
fqName
:
FqName
,
override
val
fqName
:
FqName
val
moduleName
:
Name
)
:
CirNodeWithFqName
<
CirPackage
,
CirPackage
>,
CirNodeWithMembers
<
CirPackage
,
CirPackage
>
{
)
:
CirNodeWithFqName
<
CirPackage
,
CirPackage
>,
CirNodeWithMembers
<
CirPackage
,
CirPackage
>
{
override
val
properties
:
MutableMap
<
PropertyApproximationKey
,
CirPropertyNode
>
=
THashMap
()
override
val
properties
:
MutableMap
<
PropertyApproximationKey
,
CirPropertyNode
>
=
THashMap
()
...
...
native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/CirTreeMerger.kt
浏览文件 @
5d19ac16
...
@@ -130,7 +130,7 @@ class CirTreeMerger(
...
@@ -130,7 +130,7 @@ class CirTreeMerger(
moduleNode
.
targetDeclarations
[
targetIndex
]
=
CirModuleFactory
.
create
(
moduleDescriptor
)
moduleNode
.
targetDeclarations
[
targetIndex
]
=
CirModuleFactory
.
create
(
moduleDescriptor
)
moduleDescriptor
.
collectNonEmptyPackageMemberScopes
{
packageFqName
,
packageMemberScope
->
moduleDescriptor
.
collectNonEmptyPackageMemberScopes
{
packageFqName
,
packageMemberScope
->
processPackage
(
moduleNode
,
targetIndex
,
packageFqName
.
intern
(),
packageMemberScope
,
moduleName
)
processPackage
(
moduleNode
,
targetIndex
,
packageFqName
.
intern
(),
packageMemberScope
)
}
}
}
}
...
@@ -138,11 +138,10 @@ class CirTreeMerger(
...
@@ -138,11 +138,10 @@ class CirTreeMerger(
moduleNode
:
CirModuleNode
,
moduleNode
:
CirModuleNode
,
targetIndex
:
Int
,
targetIndex
:
Int
,
packageFqName
:
FqName
,
packageFqName
:
FqName
,
packageMemberScope
:
MemberScope
,
packageMemberScope
:
MemberScope
moduleName
:
Name
)
{
)
{
val
packageNode
:
CirPackageNode
=
moduleNode
.
packages
.
getOrPut
(
packageFqName
)
{
val
packageNode
:
CirPackageNode
=
moduleNode
.
packages
.
getOrPut
(
packageFqName
)
{
buildPackageNode
(
storageManager
,
size
,
packageFqName
,
moduleName
)
buildPackageNode
(
storageManager
,
size
,
packageFqName
)
}
}
packageNode
.
targetDeclarations
[
targetIndex
]
=
CirPackageFactory
.
create
(
packageFqName
)
packageNode
.
targetDeclarations
[
targetIndex
]
=
CirPackageFactory
.
create
(
packageFqName
)
...
...
native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/nodeBuilders.kt
浏览文件 @
5d19ac16
...
@@ -5,14 +5,13 @@
...
@@ -5,14 +5,13 @@
package
org.jetbrains.kotlin.descriptors.commonizer.mergedtree
package
org.jetbrains.kotlin.descriptors.commonizer.mergedtree
import
org.jetbrains.kotlin.descriptors.commonizer.cir.
*
import
org.jetbrains.kotlin.descriptors.commonizer.cir.
CirDeclaration
import
org.jetbrains.kotlin.descriptors.commonizer.cir.impl.CirClassRecursionMarker
import
org.jetbrains.kotlin.descriptors.commonizer.cir.impl.CirClassRecursionMarker
import
org.jetbrains.kotlin.descriptors.commonizer.cir.impl.CirClassifierRecursionMarker
import
org.jetbrains.kotlin.descriptors.commonizer.cir.impl.CirClassifierRecursionMarker
import
org.jetbrains.kotlin.descriptors.commonizer.core.*
import
org.jetbrains.kotlin.descriptors.commonizer.core.*
import
org.jetbrains.kotlin.descriptors.commonizer.utils.CommonizedGroup
import
org.jetbrains.kotlin.descriptors.commonizer.utils.CommonizedGroup
import
org.jetbrains.kotlin.name.ClassId
import
org.jetbrains.kotlin.name.ClassId
import
org.jetbrains.kotlin.name.FqName
import
org.jetbrains.kotlin.name.FqName
import
org.jetbrains.kotlin.name.Name
import
org.jetbrains.kotlin.storage.NullableLazyValue
import
org.jetbrains.kotlin.storage.NullableLazyValue
import
org.jetbrains.kotlin.storage.StorageManager
import
org.jetbrains.kotlin.storage.StorageManager
...
@@ -39,14 +38,13 @@ internal fun buildModuleNode(
...
@@ -39,14 +38,13 @@ internal fun buildModuleNode(
internal
fun
buildPackageNode
(
internal
fun
buildPackageNode
(
storageManager
:
StorageManager
,
storageManager
:
StorageManager
,
size
:
Int
,
size
:
Int
,
fqName
:
FqName
,
fqName
:
FqName
moduleName
:
Name
):
CirPackageNode
=
buildNode
(
):
CirPackageNode
=
buildNode
(
storageManager
=
storageManager
,
storageManager
=
storageManager
,
size
=
size
,
size
=
size
,
commonizerProducer
=
::
PackageCommonizer
,
commonizerProducer
=
::
PackageCommonizer
,
nodeProducer
=
{
targetDeclarations
,
commonDeclaration
->
nodeProducer
=
{
targetDeclarations
,
commonDeclaration
->
CirPackageNode
(
targetDeclarations
,
commonDeclaration
,
fqName
,
moduleName
)
CirPackageNode
(
targetDeclarations
,
commonDeclaration
,
fqName
)
}
}
)
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录