From 3a203302dc89b3000ededbdfb22630c8330f6a81 Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Fri, 15 Apr 2011 11:50:54 +0200
Subject: [PATCH] less/greater comparisons for IComparable objects

---
 .../jet/codegen/ExpressionCodegen.java        | 29 ++++++++++---------
 .../jet/codegen/NamespaceGenTest.java         |  8 +++++
 2 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/idea/src/org/jetbrains/jet/codegen/ExpressionCodegen.java b/idea/src/org/jetbrains/jet/codegen/ExpressionCodegen.java
index 6efe1073662..5fc2509cb5b 100644
--- a/idea/src/org/jetbrains/jet/codegen/ExpressionCodegen.java
+++ b/idea/src/org/jetbrains/jet/codegen/ExpressionCodegen.java
@@ -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) {
diff --git a/idea/tests/org/jetbrains/jet/codegen/NamespaceGenTest.java b/idea/tests/org/jetbrains/jet/codegen/NamespaceGenTest.java
index 3b74f403d3c..6d71d85a922 100644
--- a/idea/tests/org/jetbrains/jet/codegen/NamespaceGenTest.java
+++ b/idea/tests/org/jetbrains/jet/codegen/NamespaceGenTest.java
@@ -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());