Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
硅谷海盗
kotlin
提交
b46543b8
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,发现更多精彩内容 >>
提交
b46543b8
编写于
3月 16, 2011
作者:
A
Andrey Breslav
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Support for a?b
上级
955faa35
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
41 addition
and
35 deletion
+41
-35
idea/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java
.../org/jetbrains/jet/lang/parsing/JetExpressionParsing.java
+1
-1
idea/src/org/jetbrains/jet/lang/psi/JetChangeUtil.java
idea/src/org/jetbrains/jet/lang/psi/JetChangeUtil.java
+1
-1
idea/src/org/jetbrains/jet/lang/types/JetTypeInferrer.java
idea/src/org/jetbrains/jet/lang/types/JetTypeInferrer.java
+30
-32
idea/tests/org/jetbrains/jet/types/JetTypeCheckerTest.java
idea/tests/org/jetbrains/jet/types/JetTypeCheckerTest.java
+9
-1
未找到文件。
idea/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java
浏览文件 @
b46543b8
...
...
@@ -409,7 +409,7 @@ public class JetExpressionParsing extends AbstractJetParsing {
private
void
parseCallExpression
()
{
PsiBuilder
.
Marker
mark
=
mark
();
parseAtomicExpression
();
if
(
parseCallSuffix
())
{
if
(
!
myBuilder
.
newlineBeforeCurrentToken
()
&&
parseCallSuffix
())
{
mark
.
done
(
CALL_EXPRESSION
);
}
else
{
...
...
idea/src/org/jetbrains/jet/lang/psi/JetChangeUtil.java
浏览文件 @
b46543b8
...
...
@@ -45,7 +45,7 @@ public class JetChangeUtil {
JetFile
file
=
createFile
(
project
,
text
);
JetNamespace
rootNamespace
=
file
.
getRootNamespace
();
List
<
JetDeclaration
>
dcls
=
rootNamespace
.
getDeclarations
();
assert
dcls
.
size
()
==
1
;
assert
dcls
.
size
()
==
1
:
dcls
.
size
()
;
@SuppressWarnings
(
"unchecked"
)
T
result
=
(
T
)
dcls
.
get
(
0
);
return
result
;
...
...
idea/src/org/jetbrains/jet/lang/types/JetTypeInferrer.java
浏览文件 @
b46543b8
...
...
@@ -543,24 +543,6 @@ public class JetTypeInferrer {
throw
new
UnsupportedOperationException
();
// TODO
}
@Override
public
void
visitPredicateExpression
(
JetPredicateExpression
expression
)
{
// JetExpression receiverExpression = expression.getReceiverExpression();
// JetExpression selectorExpression = expression.getSelectorExpression();
// JetType receiverType = getType(scope, receiverExpression, false);
// if (receiverType != null) {
// if (selectorExpression instanceof JetSimpleNameExpression) {
// JetScope compositeScope = new ScopeWithReceiver(scope, receiverType);
// result = getType(compositeScope, selectorExpression, false);
// }
// else if (selectorExpression != null) {
// // TODO : not a simple name -> resolve in scope, expect property type or a function type
// throw new UnsupportedOperationException();
// }
// }
throw
new
UnsupportedOperationException
();
// TODO
}
@Override
public
void
visitQualifiedExpression
(
JetQualifiedExpression
expression
)
{
// TODO : functions
...
...
@@ -569,30 +551,45 @@ public class JetTypeInferrer {
JetType
receiverType
=
getType
(
scope
,
receiverExpression
,
false
);
if
(
receiverType
!=
null
)
{
checkNullSafety
(
receiverType
,
expression
);
JetScope
compositeScope
=
new
ScopeWithReceiver
(
scope
,
receiverType
);
if
(
selectorExpression
instanceof
JetCallExpression
)
{
JetCallExpression
callExpression
=
(
JetCallExpression
)
selectorExpression
;
OverloadDomain
overloadDomain
=
getOverloadDomain
(
compositeScope
,
callExpression
.
getCalleeExpression
());
resolveOverloads
(
scope
,
callExpression
,
overloadDomain
);
}
else
if
(
selectorExpression
instanceof
JetSimpleNameExpression
)
{
result
=
getType
(
compositeScope
,
selectorExpression
,
false
);
JetType
selectorReturnType
=
getSelectorReturnType
(
receiverType
,
selectorExpression
);
if
(
expression
.
getOperationSign
()
==
JetTokens
.
QUEST
)
{
if
(
selectorReturnType
!=
null
&&
!
isBoolean
(
selectorReturnType
))
{
// TODO : more comprehensible error message
semanticServices
.
getErrorHandler
().
typeMismatch
(
selectorExpression
,
semanticServices
.
getStandardLibrary
().
getBooleanType
(),
selectorReturnType
);
}
result
=
TypeUtils
.
makeNullable
(
receiverType
);
}
else
if
(
selectorExpression
!=
null
)
{
// TODO : not a simple name -> resolve in scope, expect property type or a function type
throw
new
UnsupportedOperationException
();
else
{
result
=
selectorReturnType
;
}
}
}
private
JetType
getSelectorReturnType
(
JetType
receiverType
,
JetExpression
selectorExpression
)
{
JetScope
compositeScope
=
new
ScopeWithReceiver
(
scope
,
receiverType
);
if
(
selectorExpression
instanceof
JetCallExpression
)
{
JetCallExpression
callExpression
=
(
JetCallExpression
)
selectorExpression
;
OverloadDomain
overloadDomain
=
getOverloadDomain
(
compositeScope
,
callExpression
.
getCalleeExpression
());
return
resolveOverloads
(
scope
,
callExpression
,
overloadDomain
);
}
else
if
(
selectorExpression
instanceof
JetSimpleNameExpression
)
{
return
getType
(
compositeScope
,
selectorExpression
,
false
);
}
else
if
(
selectorExpression
!=
null
)
{
// TODO : not a simple name -> resolve in scope, expect property type or a function type
throw
new
UnsupportedOperationException
();
}
return
receiverType
;
}
@Override
public
void
visitCallExpression
(
JetCallExpression
expression
)
{
JetExpression
calleeExpression
=
expression
.
getCalleeExpression
();
OverloadDomain
overloadDomain
=
getOverloadDomain
(
scope
,
calleeExpression
);
resolveOverloads
(
scope
,
expression
,
overloadDomain
);
res
ult
=
res
olveOverloads
(
scope
,
expression
,
overloadDomain
);
}
private
void
resolveOverloads
(
JetScope
scope
,
JetCallExpression
expression
,
OverloadDomain
overloadDomain
)
{
private
JetType
resolveOverloads
(
JetScope
scope
,
JetCallExpression
expression
,
OverloadDomain
overloadDomain
)
{
// 1) ends with a name -> (scope, name) to look up
// 2) ends with something else -> just check types
...
...
@@ -640,9 +637,10 @@ public class JetTypeInferrer {
FunctionDescriptor
functionDescriptor
=
overloadDomain
.
getFunctionDescriptorForPositionedArguments
(
types
,
valueArgumentTypes
);
if
(
functionDescriptor
!=
null
)
{
re
sult
=
functionDescriptor
.
getUnsubstitutedReturnType
();
re
turn
functionDescriptor
.
getUnsubstitutedReturnType
();
}
}
return
null
;
}
@Override
...
...
idea/tests/org/jetbrains/jet/types/JetTypeCheckerTest.java
浏览文件 @
b46543b8
...
...
@@ -406,6 +406,9 @@ public class JetTypeCheckerTest extends LightDaemonAnalyzerTestCase {
assertType
(
"true && false"
,
"Boolean"
);
assertType
(
"true || false"
,
"Boolean"
);
assertType
(
"null ?: false"
,
"Boolean"
);
assertType
(
"new WithPredicate()?isValid()"
,
"WithPredicate?"
);
assertType
(
"new WithPredicate()?isValid(1)"
,
"WithPredicate?"
);
assertType
(
"new WithPredicate()?p"
,
"WithPredicate?"
);
}
private
void
assertSubtype
(
String
type1
,
String
type2
)
{
...
...
@@ -500,7 +503,12 @@ public class JetTypeCheckerTest extends LightDaemonAnalyzerTestCase {
"fun f(a : T) : Any {} "
+
"fun f(a : (Int, Int)) : T {} "
+
"fun f<E>(a : E) : T {} "
+
"}"
"}"
,
"class WithPredicate { "
+
"fun isValid() : Boolean "
+
"fun isValid(x : Int) : Boolean "
+
"val p : Boolean "
+
"}"
};
private
String
[]
FUNCTION_DECLARATIONS
=
{
"fun f() : Unit {}"
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录