Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
硅谷海盗
kotlin
提交
807b669b
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,发现更多精彩内容 >>
提交
807b669b
编写于
4月 07, 2011
作者:
D
Dmitry Jemerov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Double
上级
5b5e8119
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
17 addition
and
4 deletion
+17
-4
idea/src/org/jetbrains/jet/codegen/ExpressionCodegen.java
idea/src/org/jetbrains/jet/codegen/ExpressionCodegen.java
+5
-3
idea/src/org/jetbrains/jet/codegen/JetTypeMapper.java
idea/src/org/jetbrains/jet/codegen/JetTypeMapper.java
+3
-0
idea/src/org/jetbrains/jet/codegen/StackValue.java
idea/src/org/jetbrains/jet/codegen/StackValue.java
+1
-1
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
浏览文件 @
807b669b
...
...
@@ -506,12 +506,13 @@ public class ExpressionCodegen extends JetVisitor {
private
static
boolean
isNumberPrimitive
(
String
className
)
{
return
className
.
equals
(
"Int"
)
||
className
.
equals
(
"Long"
)
||
className
.
equals
(
"Short"
)
||
className
.
equals
(
"Byte"
)
||
className
.
equals
(
"Char"
)
||
className
.
equals
(
"Float"
);
className
.
equals
(
"Byte"
)
||
className
.
equals
(
"Char"
)
||
className
.
equals
(
"Float"
)
||
className
.
equals
(
"Double"
);
}
private
static
boolean
isNumberPrimitive
(
Type
type
)
{
return
type
==
Type
.
INT_TYPE
||
type
==
Type
.
SHORT_TYPE
||
type
==
Type
.
BYTE_TYPE
||
type
==
Type
.
CHAR_TYPE
||
type
==
Type
.
FLOAT_TYPE
;
type
==
Type
.
FLOAT_TYPE
||
type
==
Type
.
DOUBLE_TYPE
;
}
private
static
int
opcodeForMethod
(
final
String
name
)
{
...
...
@@ -526,7 +527,8 @@ public class ExpressionCodegen extends JetVisitor {
private
void
generateBinaryOp
(
JetBinaryExpression
expression
,
FunctionDescriptor
op
,
int
opcode
)
{
JetType
returnType
=
op
.
getUnsubstitutedReturnType
();
final
Type
asmType
=
typeMapper
.
mapType
(
returnType
);
if
(
asmType
==
Type
.
INT_TYPE
||
asmType
==
Type
.
LONG_TYPE
||
asmType
==
Type
.
FLOAT_TYPE
)
{
if
(
asmType
==
Type
.
INT_TYPE
||
asmType
==
Type
.
LONG_TYPE
||
asmType
==
Type
.
FLOAT_TYPE
||
asmType
==
Type
.
DOUBLE_TYPE
)
{
gen
(
expression
.
getLeft
(),
asmType
);
gen
(
expression
.
getRight
(),
asmType
);
v
.
visitInsn
(
asmType
.
getOpcode
(
opcode
));
...
...
idea/src/org/jetbrains/jet/codegen/JetTypeMapper.java
浏览文件 @
807b669b
...
...
@@ -35,6 +35,9 @@ public class JetTypeMapper {
if
(
jetType
.
equals
(
standardLibrary
.
getFloatType
()))
{
return
Type
.
FLOAT_TYPE
;
}
if
(
jetType
.
equals
(
standardLibrary
.
getDoubleType
()))
{
return
Type
.
DOUBLE_TYPE
;
}
if
(
jetType
.
equals
(
standardLibrary
.
getBooleanType
()))
{
return
Type
.
BOOLEAN_TYPE
;
}
...
...
idea/src/org/jetbrains/jet/codegen/StackValue.java
浏览文件 @
807b669b
...
...
@@ -158,7 +158,7 @@ public abstract class StackValue {
else
{
throw
new
UnsupportedOperationException
(
"don't know how to generate this condjump"
);
}
if
(
type
==
Type
.
FLOAT_TYPE
)
{
if
(
type
==
Type
.
FLOAT_TYPE
||
type
==
Type
.
DOUBLE_TYPE
)
{
if
(
opToken
==
JetTokens
.
GT
||
opToken
==
JetTokens
.
GTEQ
)
{
v
.
cmpg
(
type
);
}
...
...
idea/tests/org/jetbrains/jet/codegen/NamespaceGenTest.java
浏览文件 @
807b669b
...
...
@@ -287,6 +287,14 @@ public class NamespaceGenTest extends LightCodeInsightFixtureTestCase {
binOpTest
(
"fun foo(a: Float, b: Float): Boolean = a == b"
,
1.0f
,
1.0f
,
true
);
}
public
void
testDouble
()
throws
Exception
{
binOpTest
(
"fun foo(a: Double, b: Double): Double = a + b"
,
1.0
,
2.0
,
3.0
);
}
public
void
testDoubleCmp
()
throws
Exception
{
binOpTest
(
"fun foo(a: Double, b: Double): Boolean = a == b"
,
1.0
,
2.0
,
false
);
}
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.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录