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

Revert "more sane types for StackValue.cmp()"

Browse Source 
This reverts commit 5bebb848b6.

Conflicts:

	idea/src/org/jetbrains/jet/codegen/StackValue.java
This commit is contained in:
Dmitry Jemerov
2011-04-08 20:03:42 +02:00
parent 5a0a03c1e4
commit a83643c5e2
2 changed files with 5 additions and 5 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
@@ -594,7 +594,7 @@ public class ExpressionCodegen extends JetVisitor {
private void generateCompareOp(JetBinaryExpression expression, IElementType opToken, Type type) { private void generateCompareOp(JetBinaryExpression expression, IElementType opToken, Type type) {
gen(expression.getLeft(), type); gen(expression.getLeft(), type);
gen(expression.getRight(), type); gen(expression.getRight(), type);
myStack.push(StackValue.cmp(opToken)); myStack.push(StackValue.cmp(opToken, type));
} }
private void generateAssignmentExpression(JetBinaryExpression expression) { private void generateAssignmentExpression(JetBinaryExpression expression) {
idea/src/org/jetbrains/jet/codegen/StackValue.java
+4 -4
View File
@@ -32,8 +32,8 @@ public abstract class StackValue {
return new Constant(value, type); return new Constant(value, type);
} }
public static StackValue cmp(IElementType opToken) { public static StackValue cmp(IElementType opToken, Type type) {
return new NumberCompare(opToken); return new NumberCompare(opToken, type);
} }
public static StackValue not(StackValue stackValue) { public static StackValue not(StackValue stackValue) {
@@ -173,8 +173,8 @@ public abstract class StackValue {
private static class NumberCompare extends StackValue { private static class NumberCompare extends StackValue {
private final IElementType opToken; private final IElementType opToken;
public NumberCompare(IElementType opToken) { public NumberCompare(IElementType opToken, Type type) {
super(Type.BOOLEAN_TYPE); super(type);
this.opToken = opToken; this.opToken = opToken;
} }