Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
硅谷海盗
kotlin
提交
f0dfa436
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,发现更多精彩内容 >>
提交
f0dfa436
编写于
12月 19, 2011
作者:
S
Stepan Koltsov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
create TypeParameterDescriptorInitialization
上级
67ca0496
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
44 addition
and
19 deletion
+44
-19
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
...tbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
+44
-19
未找到文件。
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
浏览文件 @
f0dfa436
...
...
@@ -56,9 +56,24 @@ public class JavaDescriptorResolver {
return
visitor
.
visitDeclarationDescriptor
(
this
,
data
);
}
};
private
enum
TypeParameterDescriptorOrigin
{
JAVA
,
KOTLIN
,
}
private
static
class
TypeParameterDescriptorInitialization
{
private
final
TypeParameterDescriptorOrigin
origin
;
private
final
TypeParameterDescriptor
descriptor
;
private
TypeParameterDescriptorInitialization
(
TypeParameterDescriptorOrigin
origin
,
TypeParameterDescriptor
descriptor
)
{
this
.
origin
=
origin
;
this
.
descriptor
=
descriptor
;
}
}
protected
final
Map
<
String
,
ClassDescriptor
>
classDescriptorCache
=
Maps
.
newHashMap
();
protected
final
Map
<
PsiTypeParameter
,
TypeParameterDescriptor
>
typeParameterDescriptorCache
=
Maps
.
newHashMap
();
protected
final
Map
<
PsiTypeParameter
,
TypeParameterDescriptor
Initialization
>
typeParameterDescriptorCache
=
Maps
.
newHashMap
();
protected
final
Map
<
PsiMethod
,
FunctionDescriptor
>
methodDescriptorCache
=
Maps
.
newHashMap
();
protected
final
Map
<
PsiField
,
VariableDescriptor
>
fieldDescriptorCache
=
Maps
.
newHashMap
();
protected
final
Map
<
PsiElement
,
NamespaceDescriptor
>
namespaceDescriptorCache
=
Maps
.
newHashMap
();
...
...
@@ -264,7 +279,7 @@ public class JavaDescriptorResolver {
name
,
++
index
);
PsiTypeParameter
psiTypeParameter
=
getPsiTypeParameterByName
(
clazz
,
clazz
.
getQualifiedName
(),
name
);
typeParameterDescriptorCache
.
put
(
psiTypeParameter
,
typeParameter
);
typeParameterDescriptorCache
.
put
(
psiTypeParameter
,
new
TypeParameterDescriptorInitialization
(
TypeParameterDescriptorOrigin
.
KOTLIN
,
typeParameter
)
);
r
.
add
(
typeParameter
);
}
...
...
@@ -317,21 +332,26 @@ public class JavaDescriptorResolver {
psiTypeParameter
.
getName
(),
psiTypeParameter
.
getIndex
()
);
typeParameterDescriptorCache
.
put
(
psiTypeParameter
,
typeParameterDescriptor
);
typeParameterDescriptorCache
.
put
(
psiTypeParameter
,
new
TypeParameterDescriptorInitialization
(
TypeParameterDescriptorOrigin
.
JAVA
,
typeParameterDescriptor
)
);
return
typeParameterDescriptor
;
}
private
void
initializeTypeParameter
(
PsiTypeParameter
typeParameter
,
TypeParameterDescriptor
typeParameterDescriptor
)
{
PsiClassType
[]
referencedTypes
=
typeParameter
.
getExtendsList
().
getReferencedTypes
();
if
(
referencedTypes
.
length
==
0
){
typeParameterDescriptor
.
addUpperBound
(
JetStandardClasses
.
getNullableAnyType
());
}
else
if
(
referencedTypes
.
length
==
1
)
{
typeParameterDescriptor
.
addUpperBound
(
semanticServices
.
getTypeTransformer
().
transformToType
(
referencedTypes
[
0
]));
}
else
{
for
(
PsiClassType
referencedType
:
referencedTypes
)
{
typeParameterDescriptor
.
addUpperBound
(
semanticServices
.
getTypeTransformer
().
transformToType
(
referencedType
));
private
void
initializeTypeParameter
(
PsiTypeParameter
typeParameter
,
TypeParameterDescriptorInitialization
typeParameterDescriptorInitialization
)
{
TypeParameterDescriptor
typeParameterDescriptor
=
typeParameterDescriptorInitialization
.
descriptor
;
if
(
typeParameterDescriptorInitialization
.
origin
==
TypeParameterDescriptorOrigin
.
KOTLIN
)
{
// TODO
}
else
{
PsiClassType
[]
referencedTypes
=
typeParameter
.
getExtendsList
().
getReferencedTypes
();
if
(
referencedTypes
.
length
==
0
){
typeParameterDescriptor
.
addUpperBound
(
JetStandardClasses
.
getNullableAnyType
());
}
else
if
(
referencedTypes
.
length
==
1
)
{
typeParameterDescriptor
.
addUpperBound
(
semanticServices
.
getTypeTransformer
().
transformToType
(
referencedTypes
[
0
]));
}
else
{
for
(
PsiClassType
referencedType
:
referencedTypes
)
{
typeParameterDescriptor
.
addUpperBound
(
semanticServices
.
getTypeTransformer
().
transformToType
(
referencedType
));
}
}
}
typeParameterDescriptor
.
setInitialized
();
...
...
@@ -339,13 +359,13 @@ public class JavaDescriptorResolver {
private
void
initializeTypeParameters
(
PsiTypeParameterListOwner
typeParameterListOwner
)
{
for
(
PsiTypeParameter
psiTypeParameter
:
typeParameterListOwner
.
getTypeParameters
())
{
initializeTypeParameter
(
psiTypeParameter
,
resolveTypeParameter
(
psiTypeParameter
));
initializeTypeParameter
(
psiTypeParameter
,
resolveTypeParameter
Initialization
(
psiTypeParameter
));
}
}
@NotNull
private
TypeParameterDescriptor
resolveTypeParameter
(
@NotNull
DeclarationDescriptor
containingDeclaration
,
@NotNull
PsiTypeParameter
psiTypeParameter
)
{
TypeParameterDescriptor
typeParameterDescriptor
=
typeParameterDescriptorCache
.
get
(
psiTypeParameter
);
private
TypeParameterDescriptor
Initialization
resolveTypeParameter
(
@NotNull
DeclarationDescriptor
containingDeclaration
,
@NotNull
PsiTypeParameter
psiTypeParameter
)
{
TypeParameterDescriptor
Initialization
typeParameterDescriptor
=
typeParameterDescriptorCache
.
get
(
psiTypeParameter
);
assert
typeParameterDescriptor
!=
null
:
psiTypeParameter
.
getText
();
return
typeParameterDescriptor
;
}
...
...
@@ -681,7 +701,7 @@ public class JavaDescriptorResolver {
name
,
++
index
);
PsiTypeParameter
psiTypeParameter
=
getPsiTypeParameterByName
(
method
,
method
.
getName
(),
name
);
typeParameterDescriptorCache
.
put
(
psiTypeParameter
,
typeParameter
);
typeParameterDescriptorCache
.
put
(
psiTypeParameter
,
new
TypeParameterDescriptorInitialization
(
TypeParameterDescriptorOrigin
.
KOTLIN
,
typeParameter
)
);
r
.
add
(
typeParameter
);
}
};
...
...
@@ -733,7 +753,8 @@ public class JavaDescriptorResolver {
(
modifierListOwner
.
hasModifierProperty
(
PsiModifier
.
PROTECTED
)
?
Visibility
.
PROTECTED
:
Visibility
.
INTERNAL
));
}
public
TypeParameterDescriptor
resolveTypeParameter
(
PsiTypeParameter
typeParameter
)
{
@NotNull
private
TypeParameterDescriptorInitialization
resolveTypeParameterInitialization
(
PsiTypeParameter
typeParameter
)
{
PsiTypeParameterListOwner
owner
=
typeParameter
.
getOwner
();
if
(
owner
instanceof
PsiClass
)
{
PsiClass
psiClass
=
(
PsiClass
)
owner
;
...
...
@@ -758,4 +779,8 @@ public class JavaDescriptorResolver {
}
throw
new
IllegalStateException
(
"Unknown parent type: "
+
owner
);
}
public
TypeParameterDescriptor
resolveTypeParameter
(
PsiTypeParameter
typeParameter
)
{
return
resolveTypeParameterInitialization
(
typeParameter
).
descriptor
;
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录