Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
硅谷海盗
kotlin
提交
16a548ed
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,发现更多精彩内容 >>
提交
16a548ed
编写于
3月 28, 2011
作者:
A
Andrey Breslav
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fewer TypeInferrerVisitor instances generated
上级
73bfc574
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
32 addition
and
21 deletion
+32
-21
idea/src/org/jetbrains/jet/lang/types/JetTypeInferrer.java
idea/src/org/jetbrains/jet/lang/types/JetTypeInferrer.java
+32
-21
未找到文件。
idea/src/org/jetbrains/jet/lang/types/JetTypeInferrer.java
浏览文件 @
16a548ed
...
...
@@ -83,13 +83,7 @@ public class JetTypeInferrer {
@Nullable
public
JetType
getType
(
@NotNull
final
JetScope
scope
,
@NotNull
JetExpression
expression
,
final
boolean
preferBlock
)
{
TypeInferrerVisitor
visitor
=
new
TypeInferrerVisitor
(
scope
,
preferBlock
);
expression
.
accept
(
visitor
);
JetType
result
=
visitor
.
getResult
();
if
(
result
!=
null
)
{
trace
.
recordExpressionType
(
expression
,
result
);
}
return
result
;
return
new
TypeInferrerVisitor
(
scope
,
preferBlock
).
getType
(
expression
);
}
@Nullable
...
...
@@ -104,12 +98,14 @@ public class JetTypeInferrer {
@Nullable
private
List
<
JetType
>
getTypes
(
JetScope
scope
,
List
<
JetExpression
>
indexExpressions
)
{
List
<
JetType
>
argumentTypes
=
new
ArrayList
<
JetType
>();
TypeInferrerVisitor
typeInferrerVisitor
=
new
TypeInferrerVisitor
(
scope
,
false
);
for
(
JetExpression
indexExpression
:
indexExpressions
)
{
JetType
type
=
getType
(
scope
,
indexExpression
,
false
);
JetType
type
=
typeInferrerVisitor
.
getType
(
indexExpression
);
if
(
type
==
null
)
{
return
null
;
}
argumentTypes
.
add
(
type
);
typeInferrerVisitor
.
resetResult
();
// TODO : recreate?
}
return
argumentTypes
;
}
...
...
@@ -276,7 +272,6 @@ public class JetTypeInferrer {
};
}
private
JetType
getBlockReturnedType
(
@NotNull
JetScope
outerScope
,
List
<
JetElement
>
block
)
{
if
(
block
.
isEmpty
())
{
return
JetStandardClasses
.
getUnitType
();
...
...
@@ -292,11 +287,7 @@ public class JetTypeInferrer {
TypeInferrerVisitorWithWritableScope
blockLevelVisitor
=
new
TypeInferrerVisitorWithWritableScope
(
scope
,
true
);
JetType
result
=
null
;
for
(
JetElement
statement
:
block
)
{
statement
.
accept
(
blockLevelVisitor
);
result
=
blockLevelVisitor
.
getResult
();
if
(
result
!=
null
)
{
trace
.
recordExpressionType
((
JetExpression
)
statement
,
result
);
}
result
=
blockLevelVisitor
.
getType
((
JetExpression
)
statement
);
blockLevelVisitor
.
resetResult
();
// TODO : maybe it's better to recreate the visitors with the same scope?
}
return
result
;
...
...
@@ -318,18 +309,42 @@ public class JetTypeInferrer {
private
class
TypeInferrerVisitor
extends
JetVisitor
{
private
final
JetScope
scope
;
protected
JetType
result
;
private
final
boolean
preferBlock
;
protected
JetType
result
;
p
ublic
TypeInferrerVisitor
(
JetScope
scope
,
boolean
preferBlock
)
{
p
rivate
TypeInferrerVisitor
(
JetScope
scope
,
boolean
preferBlock
)
{
this
.
scope
=
scope
;
this
.
preferBlock
=
preferBlock
;
}
public
JetType
getResult
()
{
@Nullable
public
JetType
getType
(
@NotNull
final
JetScope
scope
,
@NotNull
JetExpression
expression
,
final
boolean
preferBlock
)
{
TypeInferrerVisitor
visitor
;
if
(
this
.
scope
==
scope
&&
this
.
preferBlock
==
preferBlock
&&
result
==
null
)
{
visitor
=
this
;
}
else
{
visitor
=
new
TypeInferrerVisitor
(
scope
,
preferBlock
);
}
JetType
type
=
visitor
.
getType
(
expression
);
visitor
.
result
=
null
;
return
type
;
}
@Nullable
public
JetType
getType
(
@NotNull
JetExpression
expression
)
{
assert
result
==
null
;
expression
.
accept
(
this
);
if
(
result
!=
null
)
{
trace
.
recordExpressionType
(
expression
,
result
);
}
return
result
;
}
public
void
resetResult
()
{
result
=
null
;
}
@Override
public
void
visitSimpleNameExpression
(
JetSimpleNameExpression
expression
)
{
// TODO : other members
...
...
@@ -1172,10 +1187,6 @@ public class JetTypeInferrer {
this
.
scope
=
scope
;
}
public
void
resetResult
()
{
this
.
result
=
null
;
}
@Override
public
void
visitProperty
(
JetProperty
property
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录