Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
硅谷海盗
kotlin
提交
01105c8c
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,发现更多精彩内容 >>
提交
01105c8c
编写于
3月 31, 2011
作者:
A
Andrey Breslav
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Labeled expressions supported in the type inferrer
上级
87d07007
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
42 addition
and
24 deletion
+42
-24
idea/src/org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java
...c/org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java
+28
-10
idea/src/org/jetbrains/jet/lang/psi/JetLabelQualifiedExpression.java
...g/jetbrains/jet/lang/psi/JetLabelQualifiedExpression.java
+6
-0
idea/src/org/jetbrains/jet/lang/psi/JetThisExpression.java
idea/src/org/jetbrains/jet/lang/psi/JetThisExpression.java
+0
-11
idea/src/org/jetbrains/jet/lang/resolve/TopDownAnalyzer.java
idea/src/org/jetbrains/jet/lang/resolve/TopDownAnalyzer.java
+1
-1
idea/src/org/jetbrains/jet/lang/types/JetTypeInferrer.java
idea/src/org/jetbrains/jet/lang/types/JetTypeInferrer.java
+7
-2
未找到文件。
idea/src/org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java
浏览文件 @
01105c8c
package
org.jetbrains.jet.lang.cfg
;
import
com.intellij.lang.ASTNode
;
import
com.intellij.psi.tree.IElementType
;
import
org.jetbrains.annotations.NotNull
;
import
org.jetbrains.jet.lang.JetSemanticServices
;
import
org.jetbrains.jet.lang.psi.*
;
import
org.jetbrains.jet.lexer.JetTokens
;
import
java.util.Collections
;
import
java.util.Iterator
;
import
java.util.List
;
import
java.util.*
;
/**
* @author abreslav
*/
public
class
JetControlFlowProcessor
{
private
JetControlFlowBuilder
builder
;
private
final
Map
<
String
,
Stack
<
JetElement
>>
labeledElements
=
new
HashMap
<
String
,
Stack
<
JetElement
>>()
;
public
JetControlFlowProcessor
(
JetControlFlowBuilder
builder
)
{
private
final
JetSemanticServices
semanticServices
;
private
final
JetControlFlowBuilder
builder
;
public
JetControlFlowProcessor
(
JetSemanticServices
semanticServices
,
JetControlFlowBuilder
builder
)
{
this
.
semanticServices
=
semanticServices
;
this
.
builder
=
builder
;
}
...
...
@@ -32,11 +36,25 @@ public class JetControlFlowProcessor {
builder
.
exitSubroutine
(
subroutineElement
);
}
private
void
registerLabeledElement
(
@NotNull
JetSimpleNameExpression
label
,
@NotNull
JetExpression
labeledExpression
)
{
throw
new
UnsupportedOperationException
();
// TODO
private
void
enterLabeledElement
(
@NotNull
String
labelName
,
@NotNull
JetElement
labeledElement
)
{
Stack
<
JetElement
>
stack
=
labeledElements
.
get
(
labelName
);
if
(
stack
==
null
)
{
stack
=
new
Stack
<
JetElement
>();
labeledElements
.
put
(
labelName
,
stack
);
}
stack
.
push
(
labeledElement
);
}
private
void
exitElement
(
JetElement
element
)
{
// for (Iterator<Map.Entry<String, JetElement>> iterator = labeledElements.entrySet().iterator(); iterator.hasNext(); ) {
// Map.Entry<String, JetElement> entry = iterator.next();
// if (entry.getValue() == element) {
// iterator.remove();
// }
// }
}
private
JetElement
resolveLabel
(
JetSimpleNameExpression
labelElement
)
{
private
JetElement
resolveLabel
(
@NotNull
String
labelName
,
@NotNull
ASTNode
labelNode
)
{
throw
new
UnsupportedOperationException
();
// TODO
}
...
...
@@ -70,7 +88,7 @@ public class JetControlFlowProcessor {
@Override
public
void
visitLabelQualifiedExpression
(
JetLabelQualifiedExpression
expression
)
{
registerLabeledElement
(
expression
.
getTargetLabel
(),
expression
.
getLabeledExpression
());
enterLabeledElement
(
expression
.
getLabelName
(),
expression
.
getLabeledExpression
());
value
(
expression
.
getLabeledExpression
(),
false
);
}
...
...
@@ -216,7 +234,7 @@ public class JetControlFlowProcessor {
}
JetSimpleNameExpression
labelElement
=
expression
.
getTargetLabel
();
JetElement
subroutine
=
(
labelElement
!=
null
)
?
resolveLabel
(
labelElement
)
?
resolveLabel
(
expression
.
getLabelName
(),
expression
.
getTargetLabel
().
getNode
()
)
:
builder
.
getCurrentSubroutine
();
if
(
returnedExpression
==
null
)
{
builder
.
returnNoValue
(
subroutine
);
...
...
idea/src/org/jetbrains/jet/lang/psi/JetLabelQualifiedExpression.java
浏览文件 @
01105c8c
...
...
@@ -24,4 +24,10 @@ public class JetLabelQualifiedExpression extends JetExpression {
return
findChildByClass
(
JetExpression
.
class
);
}
@Nullable
public
String
getLabelName
()
{
JetSimpleNameExpression
labelElement
=
getTargetLabel
();
assert
labelElement
==
null
||
labelElement
.
getText
().
startsWith
(
"@"
);
return
labelElement
==
null
?
null
:
labelElement
.
getText
().
substring
(
1
);
}
}
idea/src/org/jetbrains/jet/lang/psi/JetThisExpression.java
浏览文件 @
01105c8c
...
...
@@ -24,15 +24,4 @@ public class JetThisExpression extends JetLabelQualifiedExpression {
return
(
JetTypeReference
)
findChildByType
(
JetNodeTypes
.
TYPE_REFERENCE
);
}
@Nullable
public
JetSimpleNameExpression
getLabelElement
()
{
return
findChildByClass
(
JetSimpleNameExpression
.
class
);
}
@Nullable
public
String
getLabelName
()
{
JetSimpleNameExpression
labelElement
=
getLabelElement
();
assert
labelElement
==
null
||
labelElement
.
getText
().
startsWith
(
"@"
);
return
labelElement
==
null
?
null
:
labelElement
.
getText
().
substring
(
1
);
}
}
idea/src/org/jetbrains/jet/lang/resolve/TopDownAnalyzer.java
浏览文件 @
01105c8c
...
...
@@ -234,7 +234,7 @@ public class TopDownAnalyzer {
if
(
bodyExpression
!=
null
)
{
System
.
out
.
println
(
"-------------"
);
JetControlFlowInstructionsGenerator
instructionsGenerator
=
new
JetControlFlowInstructionsGenerator
();
new
JetControlFlowProcessor
(
instructionsGenerator
).
generate
(
function
,
bodyExpression
);
new
JetControlFlowProcessor
(
semanticServices
,
instructionsGenerator
).
generate
(
function
,
bodyExpression
);
Pseudocode
pseudocode
=
instructionsGenerator
.
getPseudocode
();
pseudocode
.
postProcess
();
pseudocode
.
dumpInstructions
(
System
.
out
);
...
...
idea/src/org/jetbrains/jet/lang/types/JetTypeInferrer.java
浏览文件 @
01105c8c
...
...
@@ -558,10 +558,10 @@ public class JetTypeInferrer {
}
}
else
if
(
size
==
0
)
{
semanticServices
.
getErrorHandler
().
unresolvedReference
(
expression
.
get
LabelElement
());
semanticServices
.
getErrorHandler
().
unresolvedReference
(
expression
.
get
TargetLabel
());
}
else
{
JetSimpleNameExpression
labelElement
=
expression
.
get
LabelElement
();
JetSimpleNameExpression
labelElement
=
expression
.
get
TargetLabel
();
assert
labelElement
!=
null
;
semanticServices
.
getErrorHandler
().
genericError
(
labelElement
.
getNode
(),
"Ambiguous label"
);
}
...
...
@@ -989,6 +989,11 @@ public class JetTypeInferrer {
@Override
public
void
visitUnaryExpression
(
JetUnaryExpression
expression
)
{
JetSimpleNameExpression
operationSign
=
expression
.
getOperationSign
();
if
(
JetTokens
.
LABELS
.
contains
(
operationSign
.
getReferencedNameElementType
()))
{
// TODO : Some processing for the label?
result
=
getType
(
expression
.
getBaseExpression
());
return
;
}
IElementType
operationType
=
operationSign
.
getReferencedNameElementType
();
String
name
=
unaryOperationNames
.
get
(
operationType
);
if
(
name
==
null
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录