Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
硅谷海盗
kotlin
提交
3a203302
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,发现更多精彩内容 >>
提交
3a203302
编写于
4月 15, 2011
作者:
D
Dmitry Jemerov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
less/greater comparisons for IComparable objects
上级
f7d00f2d
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
24 addition
and
13 deletion
+24
-13
idea/src/org/jetbrains/jet/codegen/ExpressionCodegen.java
idea/src/org/jetbrains/jet/codegen/ExpressionCodegen.java
+16
-13
idea/tests/org/jetbrains/jet/codegen/NamespaceGenTest.java
idea/tests/org/jetbrains/jet/codegen/NamespaceGenTest.java
+8
-0
未找到文件。
idea/src/org/jetbrains/jet/codegen/ExpressionCodegen.java
浏览文件 @
3a203302
...
...
@@ -25,6 +25,7 @@ public class ExpressionCodegen extends JetVisitor {
private
static
final
String
CLASS_OBJECT
=
"java/lang/Object"
;
private
static
final
String
CLASS_STRING
=
"java/lang/String"
;
private
static
final
String
CLASS_STRING_BUILDER
=
"java/lang/StringBuilder"
;
private
static
final
String
CLASS_COMPARABLE
=
"java/lang/Comparable"
;
private
final
Stack
<
Label
>
myLoopStarts
=
new
Stack
<
Label
>();
private
final
Stack
<
Label
>
myLoopEnds
=
new
Stack
<
Label
>();
...
...
@@ -511,20 +512,17 @@ public class ExpressionCodegen extends JetVisitor {
opToken
==
JetTokens
.
EQEQEQ
||
opToken
==
JetTokens
.
EXCLEQEQEQ
)
{
generateEquals
(
expression
,
opToken
);
}
else
if
(
opToken
==
JetTokens
.
LT
||
opToken
==
JetTokens
.
LTEQ
||
opToken
==
JetTokens
.
GT
||
opToken
==
JetTokens
.
GTEQ
)
{
generateCompareOp
(
expression
,
opToken
,
expressionType
(
expression
.
getLeft
()));
}
else
{
DeclarationDescriptor
op
=
bindingContext
.
resolveReferenceExpression
(
expression
.
getOperationReference
());
if
(
op
instanceof
FunctionDescriptor
)
{
JetType
returnType
=
bindingContext
.
getExpressionType
(
expression
);
final
Type
asmType
=
typeMapper
.
mapType
(
returnType
);
DeclarationDescriptor
cls
=
op
.
getContainingDeclaration
();
if
(
isNumberPrimitive
(
cls
))
{
if
(
op
.
getName
().
equals
(
"compareTo"
))
{
generateCompareOp
(
expression
,
opToken
,
asmType
);
}
else
{
int
opcode
=
opcodeForMethod
(
op
.
getName
());
generateBinaryOp
(
expression
,
(
FunctionDescriptor
)
op
,
opcode
);
}
int
opcode
=
opcodeForMethod
(
op
.
getName
());
generateBinaryOp
(
expression
,
(
FunctionDescriptor
)
op
,
opcode
);
return
;
}
else
if
(
isClass
(
cls
,
"String"
)
&&
op
.
getName
().
equals
(
"plus"
))
{
...
...
@@ -667,10 +665,15 @@ public class ExpressionCodegen extends JetVisitor {
}
}
private
void
generateCompareOp
(
JetBinaryExpression
expression
,
IElementType
opToken
,
Type
type
)
{
gen
(
expression
.
getLeft
(),
type
);
gen
(
expression
.
getRight
(),
type
);
myStack
.
push
(
StackValue
.
cmp
(
opToken
,
type
));
private
void
generateCompareOp
(
JetBinaryExpression
expression
,
IElementType
opToken
,
Type
operandType
)
{
gen
(
expression
.
getLeft
(),
operandType
);
gen
(
expression
.
getRight
(),
operandType
);
if
(
operandType
.
getSort
()
==
Type
.
OBJECT
)
{
v
.
invokeinterface
(
CLASS_COMPARABLE
,
"compareTo"
,
"(Ljava/lang/Object;)I"
);
v
.
aconst
(
0
);
operandType
=
Type
.
INT_TYPE
;
}
myStack
.
push
(
StackValue
.
cmp
(
opToken
,
operandType
));
}
private
void
generateAssignmentExpression
(
JetBinaryExpression
expression
)
{
...
...
idea/tests/org/jetbrains/jet/codegen/NamespaceGenTest.java
浏览文件 @
3a203302
...
...
@@ -578,6 +578,14 @@ public class NamespaceGenTest extends LightCodeInsightFixtureTestCase {
assertEquals
(
"jet Lang"
,
main
.
invoke
(
null
,
"jet"
,
" "
,
"Lang"
));
}
public
void
testStringCompare
()
throws
Exception
{
loadText
(
"fun foo(s1: String, s2: String) = s1 < s2"
);
System
.
out
.
println
(
generateToText
());
final
Method
main
=
generateFunction
();
assertEquals
(
Boolean
.
TRUE
,
main
.
invoke
(
null
,
"Ceylon"
,
"Java"
));
assertEquals
(
Boolean
.
FALSE
,
main
.
invoke
(
null
,
"Jet"
,
"Java"
));
}
private
void
binOpTest
(
final
String
text
,
final
Object
arg1
,
final
Object
arg2
,
final
Object
expected
)
throws
Exception
{
loadText
(
text
);
System
.
out
.
println
(
generateToText
());
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录