azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

long cmp

Browse Source
This commit is contained in:
Dmitry Jemerov
2011-04-07 15:45:29 +02:00
parent 807b669b4b
commit 16d475249f
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/codegen/ExpressionCodegen.java
+1 -1
View File
@@ -512,7 +512,7 @@ public class ExpressionCodegen extends JetVisitor {
private static boolean isNumberPrimitive(Type type) { private static boolean isNumberPrimitive(Type type) {
return type == Type.INT_TYPE || type == Type.SHORT_TYPE || type == Type.BYTE_TYPE || type == Type.CHAR_TYPE || return type == Type.INT_TYPE || type == Type.SHORT_TYPE || type == Type.BYTE_TYPE || type == Type.CHAR_TYPE ||
type == Type.FLOAT_TYPE || type == Type.DOUBLE_TYPE; type == Type.FLOAT_TYPE || type == Type.DOUBLE_TYPE || type == Type.LONG_TYPE;
} }
private static int opcodeForMethod(final String name) { private static int opcodeForMethod(final String name) {
idea/src/org/jetbrains/jet/codegen/StackValue.java
+3
View File
@@ -166,6 +166,9 @@ public abstract class StackValue {
v.cmpl(type); v.cmpl(type);
} }
} }
else if (type == Type.LONG_TYPE) {
v.lcmp();
}
else { else {
opcode += (Opcodes.IF_ICMPEQ - Opcodes.IFEQ); opcode += (Opcodes.IF_ICMPEQ - Opcodes.IFEQ);
} }
idea/tests/org/jetbrains/jet/codegen/NamespaceGenTest.java
+3 -3
View File
@@ -237,11 +237,11 @@ public class NamespaceGenTest extends LightCodeInsightFixtureTestCase {
} }
public void testLongCmp() throws Exception { public void testLongCmp() throws Exception {
loadText("fun foo(a: Long, b: Long): Long = if (a == b) 0xffffffff else 0.lng"); loadText("fun foo(a: Long, b: Long): Long = if (a == b) 0xffffffff else 0xfffffffe");
System.out.println(generateToText()); System.out.println(generateToText());
final Method main = generateFunction(); final Method main = generateFunction();
assertEquals(0xffffffffL, main.invoke(null, 1, 1)); assertEquals(0xffffffffL, main.invoke(null, 1, 1));
assertEquals(0L, main.invoke(null, 1, 0)); assertEquals(0xfffffffeL, main.invoke(null, 1, 0));
} }
public void testShort() throws Exception { public void testShort() throws Exception {
@@ -266,7 +266,7 @@ public class NamespaceGenTest extends LightCodeInsightFixtureTestCase {
public void testByteLess() throws Exception { public void testByteLess() throws Exception {
binOpTest("fun foo(a: Byte, b: Byte): Boolean = a < b", binOpTest("fun foo(a: Byte, b: Byte): Boolean = a < b",
Byte.valueOf((byte) 126), Byte.valueOf((byte) 127), 1); Byte.valueOf((byte) 126), Byte.valueOf((byte) 127), true);
} }
public void testBooleanConstant() throws Exception { public void testBooleanConstant() throws Exception {