Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
硅谷海盗
kotlin
提交
8e551399
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,发现更多精彩内容 >>
提交
8e551399
编写于
4月 14, 2011
作者:
D
Dmitry Jemerov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
generate === and !==
上级
ae4bb5d7
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
77 addition
and
28 deletion
+77
-28
idea/src/org/jetbrains/jet/codegen/ExpressionCodegen.java
idea/src/org/jetbrains/jet/codegen/ExpressionCodegen.java
+36
-26
idea/src/org/jetbrains/jet/codegen/StackValue.java
idea/src/org/jetbrains/jet/codegen/StackValue.java
+23
-2
idea/tests/org/jetbrains/jet/codegen/NamespaceGenTest.java
idea/tests/org/jetbrains/jet/codegen/NamespaceGenTest.java
+18
-0
未找到文件。
idea/src/org/jetbrains/jet/codegen/ExpressionCodegen.java
浏览文件 @
8e551399
...
...
@@ -503,7 +503,8 @@ public class ExpressionCodegen extends JetVisitor {
else
if
(
opToken
==
JetTokens
.
OROR
)
{
generateBooleanOr
(
expression
);
}
else
if
(
opToken
==
JetTokens
.
EQEQ
||
opToken
==
JetTokens
.
EXCLEQ
)
{
else
if
(
opToken
==
JetTokens
.
EQEQ
||
opToken
==
JetTokens
.
EXCLEQ
||
opToken
==
JetTokens
.
EQEQEQ
||
opToken
==
JetTokens
.
EXCLEQEQEQ
)
{
generateEquals
(
expression
,
opToken
);
}
else
{
...
...
@@ -562,37 +563,46 @@ public class ExpressionCodegen extends JetVisitor {
else
{
gen
(
expression
.
getLeft
(),
leftType
);
gen
(
expression
.
getRight
(),
rightType
);
v
.
dup2
();
// left right left right
Label
rightNull
=
new
Label
();
v
.
ifnull
(
rightNull
);
Label
leftNull
=
new
Label
();
v
.
ifnull
(
leftNull
);
v
.
invokevirtual
(
"java/lang/Object"
,
"equals"
,
"(Ljava/lang/Object;)Z"
);
Label
end
=
new
Label
();
v
.
goTo
(
end
);
v
.
mark
(
rightNull
);
// left right left
Label
bothNull
=
new
Label
();
v
.
ifnull
(
bothNull
);
v
.
mark
(
leftNull
);
v
.
pop2
();
v
.
aconst
(
Boolean
.
FALSE
);
v
.
goTo
(
end
);
v
.
mark
(
bothNull
);
v
.
pop2
();
v
.
aconst
(
Boolean
.
TRUE
);
v
.
mark
(
end
);
final
StackValue
onStack
=
StackValue
.
onStack
(
Type
.
BOOLEAN_TYPE
);
if
(
opToken
==
JetTokens
.
EXCLEQ
)
{
myStack
.
push
(
StackValue
.
not
(
onStack
));
if
(
opToken
==
JetTokens
.
EQEQEQ
||
opToken
==
JetTokens
.
EXCLEQEQEQ
)
{
myStack
.
push
(
StackValue
.
cmp
(
opToken
,
leftType
));
}
else
{
myStack
.
push
(
onStack
);
generateNullSafeEquals
(
opToken
);
}
}
}
private
void
generateNullSafeEquals
(
IElementType
opToken
)
{
v
.
dup2
();
// left right left right
Label
rightNull
=
new
Label
();
v
.
ifnull
(
rightNull
);
Label
leftNull
=
new
Label
();
v
.
ifnull
(
leftNull
);
v
.
invokevirtual
(
"java/lang/Object"
,
"equals"
,
"(Ljava/lang/Object;)Z"
);
Label
end
=
new
Label
();
v
.
goTo
(
end
);
v
.
mark
(
rightNull
);
// left right left
Label
bothNull
=
new
Label
();
v
.
ifnull
(
bothNull
);
v
.
mark
(
leftNull
);
v
.
pop2
();
v
.
aconst
(
Boolean
.
FALSE
);
v
.
goTo
(
end
);
v
.
mark
(
bothNull
);
v
.
pop2
();
v
.
aconst
(
Boolean
.
TRUE
);
v
.
mark
(
end
);
final
StackValue
onStack
=
StackValue
.
onStack
(
Type
.
BOOLEAN_TYPE
);
if
(
opToken
==
JetTokens
.
EXCLEQ
)
{
myStack
.
push
(
StackValue
.
not
(
onStack
));
}
else
{
myStack
.
push
(
onStack
);
}
}
private
static
boolean
isNumberPrimitive
(
DeclarationDescriptor
descriptor
)
{
if
(!(
descriptor
instanceof
ClassDescriptor
))
{
return
false
;
...
...
idea/src/org/jetbrains/jet/codegen/StackValue.java
浏览文件 @
8e551399
...
...
@@ -33,7 +33,7 @@ public abstract class StackValue {
}
public
static
StackValue
cmp
(
IElementType
opToken
,
Type
type
)
{
return
new
NumberCompare
(
opToken
,
type
);
return
type
.
getSort
()
==
Type
.
OBJECT
?
new
ObjectCompare
(
opToken
,
type
)
:
new
NumberCompare
(
opToken
,
type
);
}
public
static
StackValue
not
(
StackValue
stackValue
)
{
...
...
@@ -171,7 +171,7 @@ public abstract class StackValue {
}
private
static
class
NumberCompare
extends
StackValue
{
pr
ivate
final
IElementType
opToken
;
pr
otected
final
IElementType
opToken
;
private
final
Type
operandType
;
public
NumberCompare
(
IElementType
opToken
,
Type
operandType
)
{
...
...
@@ -230,6 +230,27 @@ public abstract class StackValue {
}
}
private
static
class
ObjectCompare
extends
NumberCompare
{
public
ObjectCompare
(
IElementType
opToken
,
Type
operandType
)
{
super
(
opToken
,
operandType
);
}
@Override
public
void
condJump
(
Label
label
,
boolean
jumpIfFalse
,
InstructionAdapter
v
)
{
int
opcode
;
if
(
opToken
==
JetTokens
.
EQEQEQ
)
{
opcode
=
jumpIfFalse
?
Opcodes
.
IF_ACMPNE
:
Opcodes
.
IF_ACMPEQ
;
}
else
if
(
opToken
==
JetTokens
.
EXCLEQEQEQ
)
{
opcode
=
jumpIfFalse
?
Opcodes
.
IF_ACMPEQ
:
Opcodes
.
IF_ACMPNE
;
}
else
{
throw
new
UnsupportedOperationException
(
"don't know how to generate this condjump"
);
}
v
.
visitJumpInsn
(
opcode
,
label
);
}
}
private
static
class
Invert
extends
StackValue
{
private
StackValue
myOperand
;
...
...
idea/tests/org/jetbrains/jet/codegen/NamespaceGenTest.java
浏览文件 @
8e551399
...
...
@@ -537,6 +537,24 @@ public class NamespaceGenTest extends LightCodeInsightFixtureTestCase {
assertEquals
(
Boolean
.
FALSE
,
main
.
invoke
(
null
,
"jet"
));
}
public
void
testTripleEq
()
throws
Exception
{
loadText
(
"fun foo(s1: String?, s2: String?) = s1 === s2"
);
final
Method
main
=
generateFunction
();
String
s1
=
new
String
(
"jet"
);
String
s2
=
new
String
(
"jet"
);
assertEquals
(
Boolean
.
TRUE
,
main
.
invoke
(
null
,
s1
,
s1
));
assertEquals
(
Boolean
.
FALSE
,
main
.
invoke
(
null
,
s1
,
s2
));
}
public
void
testTripleNotEq
()
throws
Exception
{
loadText
(
"fun foo(s1: String?, s2: String?) = s1 !== s2"
);
final
Method
main
=
generateFunction
();
String
s1
=
new
String
(
"jet"
);
String
s2
=
new
String
(
"jet"
);
assertEquals
(
Boolean
.
FALSE
,
main
.
invoke
(
null
,
s1
,
s1
));
assertEquals
(
Boolean
.
TRUE
,
main
.
invoke
(
null
,
s1
,
s2
));
}
public
void
testFunctionCall
()
throws
Exception
{
loadFile
(
"functionCall.jet"
);
System
.
out
.
println
(
generateToText
());
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录