Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
硅谷海盗
kotlin
提交
e087b080
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,发现更多精彩内容 >>
提交
e087b080
编写于
5月 13, 2011
作者:
A
Andrey Breslav
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
A bug with local variable initializers fixed
上级
b75354f4
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
36 addition
and
31 deletion
+36
-31
idea/src/org/jetbrains/jet/lang/resolve/BindingTraceContext.java
...c/org/jetbrains/jet/lang/resolve/BindingTraceContext.java
+0
-1
idea/src/org/jetbrains/jet/lang/resolve/ClassDescriptorResolver.java
...g/jetbrains/jet/lang/resolve/ClassDescriptorResolver.java
+35
-29
idea/src/org/jetbrains/jet/lang/types/JetTypeInferrer.java
idea/src/org/jetbrains/jet/lang/types/JetTypeInferrer.java
+1
-1
未找到文件。
idea/src/org/jetbrains/jet/lang/resolve/BindingTraceContext.java
浏览文件 @
e087b080
...
...
@@ -72,7 +72,6 @@ public class BindingTraceContext implements BindingContext, BindingTrace {
@Override
public
void
recordExpressionType
(
@NotNull
JetExpression
expression
,
@NotNull
JetType
type
)
{
expressionTypes
.
put
(
expression
,
type
);
markAsProcessed
(
expression
);
}
@Override
...
...
idea/src/org/jetbrains/jet/lang/resolve/ClassDescriptorResolver.java
浏览文件 @
e087b080
...
...
@@ -401,7 +401,7 @@ public class ClassDescriptorResolver {
@NotNull
public
VariableDescriptor
resolveLocalVariableDescriptor
(
DeclarationDescriptor
containingDeclaration
,
WritableScope
scope
,
JetProperty
property
)
{
JetType
type
=
getType
(
scope
,
property
);
JetType
type
=
getType
(
scope
,
property
,
false
);
// For a local variable the type must not be deferred
VariableDescriptorImpl
variableDescriptor
=
new
LocalVariableDescriptor
(
containingDeclaration
,
...
...
@@ -415,7 +415,7 @@ public class ClassDescriptorResolver {
@NotNull
public
PropertyDescriptor
resolvePropertyDescriptor
(
@NotNull
DeclarationDescriptor
containingDeclaration
,
@NotNull
JetScope
scope
,
JetProperty
property
)
{
JetType
type
=
getType
(
scope
,
property
);
JetType
type
=
getType
(
scope
,
property
,
true
);
boolean
isVar
=
property
.
isVar
();
JetModifierList
modifierList
=
property
.
getModifierList
();
...
...
@@ -436,6 +436,39 @@ public class ClassDescriptorResolver {
return
propertyDescriptor
;
}
@NotNull
private
JetType
getType
(
@NotNull
final
JetScope
scope
,
@NotNull
JetProperty
property
,
boolean
allowDeferred
)
{
// TODO : receiver?
JetTypeReference
propertyTypeRef
=
property
.
getPropertyTypeRef
();
JetType
type
;
if
(
propertyTypeRef
==
null
)
{
final
JetExpression
initializer
=
property
.
getInitializer
();
if
(
initializer
==
null
)
{
trace
.
getErrorHandler
().
genericError
(
property
.
getNode
(),
"This property must either have a type annotation or be initialized"
);
type
=
ErrorUtils
.
createErrorType
(
"No type, no body"
);
}
else
{
// TODO : ??? Fix-point here: what if we have something like "val a = foo {a.bar()}"
// TODO : a risk of a memory leak
LazyValue
<
JetType
>
lazyValue
=
new
LazyValue
<
JetType
>()
{
@Override
protected
JetType
compute
()
{
return
semanticServices
.
getTypeInferrer
(
trace
,
JetFlowInformationProvider
.
THROW_EXCEPTION
).
safeGetType
(
scope
,
initializer
,
false
);
}
};
if
(
allowDeferred
)
{
type
=
new
DeferredType
(
lazyValue
);
}
else
{
type
=
lazyValue
.
get
();
}
}
}
else
{
type
=
typeResolver
.
resolveType
(
scope
,
propertyTypeRef
);
}
return
type
;
}
@NotNull
private
MemberModifiers
resolveModifiers
(
@Nullable
JetModifierList
modifierList
,
@NotNull
MemberModifiers
defaultModifiers
)
{
if
(
modifierList
==
null
)
return
defaultModifiers
;
...
...
@@ -515,33 +548,6 @@ public class ClassDescriptorResolver {
return
getterDescriptor
;
}
@NotNull
private
JetType
getType
(
@NotNull
final
JetScope
scope
,
@NotNull
JetProperty
property
)
{
// TODO : receiver?
JetTypeReference
propertyTypeRef
=
property
.
getPropertyTypeRef
();
JetType
type
;
if
(
propertyTypeRef
==
null
)
{
final
JetExpression
initializer
=
property
.
getInitializer
();
if
(
initializer
==
null
)
{
trace
.
getErrorHandler
().
genericError
(
property
.
getNode
(),
"This property must either have a type annotation or be initialized"
);
type
=
ErrorUtils
.
createErrorType
(
"No type, no body"
);
}
else
{
// TODO : ??? Fix-point here: what if we have something like "val a = foo {a.bar()}"
// TODO : a risk of a memory leak
type
=
new
DeferredType
(
new
LazyValue
<
JetType
>()
{
@Override
protected
JetType
compute
()
{
return
semanticServices
.
getTypeInferrer
(
trace
,
JetFlowInformationProvider
.
THROW_EXCEPTION
).
safeGetType
(
scope
,
initializer
,
false
);
}
});
}
}
else
{
type
=
typeResolver
.
resolveType
(
scope
,
propertyTypeRef
);
}
return
type
;
}
@NotNull
public
ConstructorDescriptor
resolveSecondaryConstructorDescriptor
(
@NotNull
JetScope
scope
,
@NotNull
ClassDescriptor
classDescriptor
,
@NotNull
JetConstructor
constructor
)
{
return
createConstructorDescriptor
(
scope
,
classDescriptor
,
false
,
constructor
.
getModifierList
(),
constructor
,
constructor
.
getParameters
());
...
...
idea/src/org/jetbrains/jet/lang/types/JetTypeInferrer.java
浏览文件 @
e087b080
...
...
@@ -599,7 +599,6 @@ public class JetTypeInferrer {
}
try
{
expression
.
accept
(
this
);
trace
.
markAsProcessed
(
expression
);
if
(
result
instanceof
DeferredType
)
{
result
=
((
DeferredType
)
result
).
getActualType
();
}
...
...
@@ -615,6 +614,7 @@ public class JetTypeInferrer {
result
=
null
;
}
trace
.
markAsProcessed
(
expression
);
return
result
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录