Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
硅谷海盗
kotlin
提交
054b5919
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,发现更多精彩内容 >>
提交
054b5919
编写于
2月 05, 2021
作者:
D
Dmitriy Dolovov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[Commonizer] Don't keep fqName inside of CirPackageNode
上级
5d19ac16
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
12 addition
and
18 deletion
+12
-18
native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/CirNode.kt
...rains/kotlin/descriptors/commonizer/mergedtree/CirNode.kt
+2
-7
native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/CirPackageNode.kt
...otlin/descriptors/commonizer/mergedtree/CirPackageNode.kt
+6
-3
native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/CirTreeMerger.kt
...kotlin/descriptors/commonizer/mergedtree/CirTreeMerger.kt
+2
-2
native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/nodeBuilders.kt
.../kotlin/descriptors/commonizer/mergedtree/nodeBuilders.kt
+2
-6
未找到文件。
native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/CirNode.kt
浏览文件 @
054b5919
...
@@ -10,7 +10,6 @@ import org.jetbrains.kotlin.descriptors.commonizer.cir.CirDeclaration
...
@@ -10,7 +10,6 @@ import org.jetbrains.kotlin.descriptors.commonizer.cir.CirDeclaration
import
org.jetbrains.kotlin.descriptors.commonizer.cir.CirLiftedUpDeclaration
import
org.jetbrains.kotlin.descriptors.commonizer.cir.CirLiftedUpDeclaration
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.Name
import
org.jetbrains.kotlin.name.Name
import
org.jetbrains.kotlin.storage.NullableLazyValue
import
org.jetbrains.kotlin.storage.NullableLazyValue
...
@@ -28,8 +27,8 @@ interface CirNode<T : CirDeclaration, R : CirDeclaration> {
...
@@ -28,8 +27,8 @@ interface CirNode<T : CirDeclaration, R : CirDeclaration> {
get
()
=
targetDeclarations
.
size
+
1
get
()
=
targetDeclarations
.
size
+
1
fun
toString
(
node
:
CirNode
<
*
,
*
>)
=
buildString
{
fun
toString
(
node
:
CirNode
<
*
,
*
>)
=
buildString
{
if
(
node
is
Cir
NodeWithFqNam
e
)
{
if
(
node
is
Cir
PackageNod
e
)
{
append
(
"
fqName="
).
append
(
node
.
f
qName
.
asString
()).
append
(
", "
)
append
(
"
packageFqName="
).
append
(
node
.
packageF
qName
.
asString
()).
append
(
", "
)
}
}
if
(
node
is
CirNodeWithClassId
)
{
if
(
node
is
CirNodeWithClassId
)
{
append
(
"classId="
).
append
(
node
.
classId
.
asString
()).
append
(
", "
)
append
(
"classId="
).
append
(
node
.
classId
.
asString
()).
append
(
", "
)
...
@@ -46,10 +45,6 @@ interface CirNodeWithClassId<T : CirClassifier, R : CirClassifier> : CirNode<T,
...
@@ -46,10 +45,6 @@ interface CirNodeWithClassId<T : CirClassifier, R : CirClassifier> : CirNode<T,
val
classId
:
ClassId
val
classId
:
ClassId
}
}
interface
CirNodeWithFqName
<
T
:
CirDeclaration
,
R
:
CirDeclaration
>
:
CirNode
<
T
,
R
>
{
val
fqName
:
FqName
}
interface
CirNodeWithLiftingUp
<
T
:
CirDeclaration
,
R
:
CirDeclaration
>
:
CirNode
<
T
,
R
>
{
interface
CirNodeWithLiftingUp
<
T
:
CirDeclaration
,
R
:
CirDeclaration
>
:
CirNode
<
T
,
R
>
{
val
isLiftedUp
:
Boolean
val
isLiftedUp
:
Boolean
get
()
=
(
commonDeclaration
()
as
?
CirLiftedUpDeclaration
)
?.
isLiftedUp
==
true
get
()
=
(
commonDeclaration
()
as
?
CirLiftedUpDeclaration
)
?.
isLiftedUp
==
true
...
...
native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/CirPackageNode.kt
浏览文件 @
054b5919
...
@@ -8,21 +8,24 @@ package org.jetbrains.kotlin.descriptors.commonizer.mergedtree
...
@@ -8,21 +8,24 @@ package org.jetbrains.kotlin.descriptors.commonizer.mergedtree
import
gnu.trove.THashMap
import
gnu.trove.THashMap
import
org.jetbrains.kotlin.descriptors.commonizer.cir.CirPackage
import
org.jetbrains.kotlin.descriptors.commonizer.cir.CirPackage
import
org.jetbrains.kotlin.descriptors.commonizer.utils.CommonizedGroup
import
org.jetbrains.kotlin.descriptors.commonizer.utils.CommonizedGroup
import
org.jetbrains.kotlin.descriptors.commonizer.utils.firstNonNull
import
org.jetbrains.kotlin.name.FqName
import
org.jetbrains.kotlin.name.FqName
import
org.jetbrains.kotlin.name.Name
import
org.jetbrains.kotlin.name.Name
import
org.jetbrains.kotlin.storage.NullableLazyValue
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
)
:
CirNodeWithMembers
<
CirPackage
,
CirPackage
>
{
)
:
CirNodeWithFqName
<
CirPackage
,
CirPackage
>,
CirNodeWithMembers
<
CirPackage
,
CirPackage
>
{
override
val
properties
:
MutableMap
<
PropertyApproximationKey
,
CirPropertyNode
>
=
THashMap
()
override
val
properties
:
MutableMap
<
PropertyApproximationKey
,
CirPropertyNode
>
=
THashMap
()
override
val
functions
:
MutableMap
<
FunctionApproximationKey
,
CirFunctionNode
>
=
THashMap
()
override
val
functions
:
MutableMap
<
FunctionApproximationKey
,
CirFunctionNode
>
=
THashMap
()
override
val
classes
:
MutableMap
<
Name
,
CirClassNode
>
=
THashMap
()
override
val
classes
:
MutableMap
<
Name
,
CirClassNode
>
=
THashMap
()
val
typeAliases
:
MutableMap
<
Name
,
CirTypeAliasNode
>
=
THashMap
()
val
typeAliases
:
MutableMap
<
Name
,
CirTypeAliasNode
>
=
THashMap
()
val
packageFqName
:
FqName
get
()
=
targetDeclarations
.
firstNonNull
().
fqName
override
fun
<
T
,
R
>
accept
(
visitor
:
CirNodeVisitor
<
T
,
R
>,
data
:
T
)
=
override
fun
<
T
,
R
>
accept
(
visitor
:
CirNodeVisitor
<
T
,
R
>,
data
:
T
)
=
visitor
.
visitPackageNode
(
this
,
data
)
visitor
.
visitPackageNode
(
this
,
data
)
...
...
native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/CirTreeMerger.kt
浏览文件 @
054b5919
...
@@ -141,7 +141,7 @@ class CirTreeMerger(
...
@@ -141,7 +141,7 @@ class CirTreeMerger(
packageMemberScope
:
MemberScope
packageMemberScope
:
MemberScope
)
{
)
{
val
packageNode
:
CirPackageNode
=
moduleNode
.
packages
.
getOrPut
(
packageFqName
)
{
val
packageNode
:
CirPackageNode
=
moduleNode
.
packages
.
getOrPut
(
packageFqName
)
{
buildPackageNode
(
storageManager
,
size
,
packageFqName
)
buildPackageNode
(
storageManager
,
size
)
}
}
packageNode
.
targetDeclarations
[
targetIndex
]
=
CirPackageFactory
.
create
(
packageFqName
)
packageNode
.
targetDeclarations
[
targetIndex
]
=
CirPackageFactory
.
create
(
packageFqName
)
...
@@ -237,7 +237,7 @@ class CirTreeMerger(
...
@@ -237,7 +237,7 @@ class CirTreeMerger(
typeAliasDescriptor
:
TypeAliasDescriptor
typeAliasDescriptor
:
TypeAliasDescriptor
)
{
)
{
val
typeAliasName
=
typeAliasDescriptor
.
name
.
intern
()
val
typeAliasName
=
typeAliasDescriptor
.
name
.
intern
()
val
typeAliasClassId
=
internedClassId
(
packageNode
.
f
qName
,
typeAliasName
)
val
typeAliasClassId
=
internedClassId
(
packageNode
.
packageF
qName
,
typeAliasName
)
val
typeAliasNode
:
CirTypeAliasNode
=
packageNode
.
typeAliases
.
getOrPut
(
typeAliasName
)
{
val
typeAliasNode
:
CirTypeAliasNode
=
packageNode
.
typeAliases
.
getOrPut
(
typeAliasName
)
{
buildTypeAliasNode
(
storageManager
,
size
,
classifiers
,
typeAliasClassId
)
buildTypeAliasNode
(
storageManager
,
size
,
classifiers
,
typeAliasClassId
)
...
...
native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/nodeBuilders.kt
浏览文件 @
054b5919
...
@@ -11,7 +11,6 @@ import org.jetbrains.kotlin.descriptors.commonizer.cir.impl.CirClassifierRecursi
...
@@ -11,7 +11,6 @@ import org.jetbrains.kotlin.descriptors.commonizer.cir.impl.CirClassifierRecursi
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.storage.NullableLazyValue
import
org.jetbrains.kotlin.storage.NullableLazyValue
import
org.jetbrains.kotlin.storage.StorageManager
import
org.jetbrains.kotlin.storage.StorageManager
...
@@ -37,15 +36,12 @@ internal fun buildModuleNode(
...
@@ -37,15 +36,12 @@ internal fun buildModuleNode(
internal
fun
buildPackageNode
(
internal
fun
buildPackageNode
(
storageManager
:
StorageManager
,
storageManager
:
StorageManager
,
size
:
Int
,
size
:
Int
fqName
:
FqName
):
CirPackageNode
=
buildNode
(
):
CirPackageNode
=
buildNode
(
storageManager
=
storageManager
,
storageManager
=
storageManager
,
size
=
size
,
size
=
size
,
commonizerProducer
=
::
PackageCommonizer
,
commonizerProducer
=
::
PackageCommonizer
,
nodeProducer
=
{
targetDeclarations
,
commonDeclaration
->
nodeProducer
=
::
CirPackageNode
CirPackageNode
(
targetDeclarations
,
commonDeclaration
,
fqName
)
}
)
)
internal
fun
buildPropertyNode
(
internal
fun
buildPropertyNode
(
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录