Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
硅谷海盗
kotlin
提交
7eded2d5
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,发现更多精彩内容 >>
提交
7eded2d5
编写于
5月 24, 2011
作者:
A
Andrey Breslav
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
JET-49 Resolve extension functions with generic receivers
上级
1d948b01
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
9 addition
and
60 deletion
+9
-60
idea/src/org/jetbrains/jet/lang/descriptors/FunctionDescriptorUtil.java
...etbrains/jet/lang/descriptors/FunctionDescriptorUtil.java
+7
-58
idea/src/org/jetbrains/jet/lang/types/JetTypeInferrer.java
idea/src/org/jetbrains/jet/lang/types/JetTypeInferrer.java
+2
-2
未找到文件。
idea/src/org/jetbrains/jet/lang/descriptors/FunctionDescriptorUtil.java
浏览文件 @
7eded2d5
package
org.jetbrains.jet.lang.descriptors
;
package
org.jetbrains.jet.lang.descriptors
;
import
com.google.common.base.Function
;
import
com.google.common.collect.BiMap
;
import
com.google.common.collect.*
;
import
com.google.common.collect.HashBiMap
;
import
com.google.common.collect.Maps
;
import
org.jetbrains.annotations.NotNull
;
import
org.jetbrains.annotations.NotNull
;
import
org.jetbrains.annotations.Nullable
;
import
org.jetbrains.annotations.Nullable
;
import
org.jetbrains.jet.lang.resolve.*
;
import
org.jetbrains.jet.lang.resolve.BindingTrace
;
import
org.jetbrains.jet.lang.resolve.JetScope
;
import
org.jetbrains.jet.lang.resolve.WritableScope
;
import
org.jetbrains.jet.lang.resolve.WritableScopeImpl
;
import
org.jetbrains.jet.lang.types.*
;
import
org.jetbrains.jet.lang.types.*
;
import
java.util.*
;
import
java.util.*
;
...
@@ -230,59 +234,4 @@ public class FunctionDescriptorUtil {
...
@@ -230,59 +234,4 @@ public class FunctionDescriptorUtil {
return
OverrideCompatibilityInfo
.
success
();
return
OverrideCompatibilityInfo
.
success
();
}
}
@NotNull
public
static
FunctionGroup
filteredFunctionGroup
(
@NotNull
final
FunctionGroup
functionGroup
,
@NotNull
final
Function
<
FunctionDescriptor
,
Boolean
>
criterion
)
{
return
new
FunctionGroup
()
{
@NotNull
@Override
public
String
getName
()
{
return
functionGroup
.
getName
();
}
@NotNull
@Override
public
OverloadResolutionResult
getPossiblyApplicableFunctions
(
@NotNull
List
<
JetType
>
typeArguments
,
@NotNull
List
<
JetType
>
positionedValueArgumentTypes
)
{
OverloadResolutionResult
possiblyApplicableFunctions
=
functionGroup
.
getPossiblyApplicableFunctions
(
typeArguments
,
positionedValueArgumentTypes
);
List
<
FunctionDescriptor
>
functionDescriptors
=
Lists
.
newArrayList
(
possiblyApplicableFunctions
.
getFunctionDescriptors
());
for
(
Iterator
<
FunctionDescriptor
>
iterator
=
functionDescriptors
.
iterator
();
iterator
.
hasNext
();
)
{
FunctionDescriptor
functionDescriptor
=
iterator
.
next
();
if
(!
criterion
.
apply
(
functionDescriptor
))
{
iterator
.
remove
();
}
}
if
(
functionDescriptors
.
isEmpty
())
{
return
OverloadResolutionResult
.
nameNotFound
();
}
if
(
possiblyApplicableFunctions
.
isSuccess
()
||
possiblyApplicableFunctions
.
isAmbiguity
())
{
if
(
functionDescriptors
.
size
()
==
1
)
{
return
OverloadResolutionResult
.
success
(
functionDescriptors
.
get
(
0
));
}
return
OverloadResolutionResult
.
ambiguity
(
functionDescriptors
);
}
if
(
functionDescriptors
.
size
()
==
1
)
{
return
OverloadResolutionResult
.
singleFunctionArgumentMismatch
(
functionDescriptors
.
get
(
0
));
}
return
OverloadResolutionResult
.
ambiguity
(
functionDescriptors
);
}
@Override
public
boolean
isEmpty
()
{
return
getFunctionDescriptors
().
isEmpty
();
}
@NotNull
@Override
public
Set
<
FunctionDescriptor
>
getFunctionDescriptors
()
{
Set
<
FunctionDescriptor
>
functionDescriptors
=
Sets
.
newHashSet
(
functionGroup
.
getFunctionDescriptors
());
for
(
Iterator
<
FunctionDescriptor
>
iterator
=
functionDescriptors
.
iterator
();
iterator
.
hasNext
();
)
{
FunctionDescriptor
functionDescriptor
=
iterator
.
next
();
if
(!
criterion
.
apply
(
functionDescriptor
))
{
iterator
.
remove
();
}
}
return
functionDescriptors
;
}
};
}
}
}
idea/src/org/jetbrains/jet/lang/types/JetTypeInferrer.java
浏览文件 @
7eded2d5
...
@@ -1394,13 +1394,13 @@ public class JetTypeInferrer {
...
@@ -1394,13 +1394,13 @@ public class JetTypeInferrer {
}
}
private
JetType
getSelectorReturnType
(
JetType
receiverType
,
JetExpression
selectorExpression
)
{
private
JetType
getSelectorReturnType
(
JetType
receiverType
,
JetExpression
selectorExpression
)
{
JetScope
compositeScope
=
new
ScopeWithReceiver
(
scope
,
receiverType
,
semanticServices
.
getTypeChecker
());
if
(
selectorExpression
instanceof
JetCallExpression
)
{
if
(
selectorExpression
instanceof
JetCallExpression
)
{
JetCallExpression
callExpression
=
(
JetCallExpression
)
selectorExpression
;
JetCallExpression
callExpression
=
(
JetCallExpression
)
selectorExpression
;
OverloadDomain
overloadDomain
=
getOverloadDomain
(
receiverType
,
compositeS
cope
,
callExpression
.
getCalleeExpression
(),
callExpression
.
getValueArgumentList
());
OverloadDomain
overloadDomain
=
getOverloadDomain
(
receiverType
,
s
cope
,
callExpression
.
getCalleeExpression
(),
callExpression
.
getValueArgumentList
());
return
resolveOverloads
(
scope
,
callExpression
,
overloadDomain
);
return
resolveOverloads
(
scope
,
callExpression
,
overloadDomain
);
}
}
else
if
(
selectorExpression
instanceof
JetSimpleNameExpression
)
{
else
if
(
selectorExpression
instanceof
JetSimpleNameExpression
)
{
JetScope
compositeScope
=
new
ScopeWithReceiver
(
scope
,
receiverType
,
semanticServices
.
getTypeChecker
());
return
getType
(
compositeScope
,
selectorExpression
,
false
);
return
getType
(
compositeScope
,
selectorExpression
,
false
);
}
}
else
if
(
selectorExpression
!=
null
)
{
else
if
(
selectorExpression
!=
null
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录