KT-4349 Make jet.Boolean implement Comparable

#KT-4349

compiler/frontend/builtins/jet/BooleanIterator.kotlin_class

@@ -1,9 +1,9 @@
-&2
+&2
 
 	Z
-0B
+0B
 	Z
-&0B
+&0B
 	j
 Ć
0B
-
+

compiler/frontend/builtins/jet/ByteIterator.kotlin_class

@@ -1,9 +1,9 @@
 &2
 
-Z
+
Z
-0B
+0B
-Z
+
Z
 &0?B
-j
+
j
 ﾆ
0B
 

compiler/frontend/builtins/jet/CharIterator.kotlin_class

@@ -1,7 +1,7 @@
 &"2
 
 Z
-0B
+0B
 Z
 &0MB
 j

compiler/frontend/builtins/jet/DoubleIterator.kotlin_class

@@ -1,7 +1,7 @@
 &*2
 
 Z
-0B
+0B
 Z
 &0]B
 j

compiler/frontend/builtins/jet/FloatIterator.kotlin_class

@@ -1,7 +1,7 @@
 &F2
 
 Z
-0B
+0B
 Z&0Ş
B
 j
 Ć
0B

compiler/frontend/builtins/jet/IntIterator.kotlin_class

@@ -1,7 +1,7 @@
 &f2
 
 Z
-0B
+0B
 Z&0Ň
B
 j
 Ć
0B

compiler/frontend/builtins/jet/LongIterator.kotlin_class

@@ -1,7 +1,7 @@
 &ą
2
 
 Z
-0B
+0B
 Z&0ŠB
 j
 Ć
0B

compiler/frontend/builtins/jet/Number.kotlin_class

@@ -1,7 +1,7 @@
-&
2
+&2
  Z
 &06B
-Z
+
Z
 &07B
 Z
 &08B
@@ -15,4 +15,4 @@
 &0<B
 j
 Ć
0B
-
+

compiler/frontend/builtins/jet/ShortIterator.kotlin_class

@@ -1,7 +1,7 @@
 &Ă
2
 
 Z
-0B
+0B
 Z&0ŇB
 j
 Ć
0B

compiler/testData/builtin-classes.txt

@@ -26,9 +26,10 @@ public final class Array</*0*/ reified T> {
     public final fun set(/*0*/ index: jet.Int, /*1*/ value: T): jet.Unit
 }
 
-public final class Boolean {
+public final class Boolean : jet.Comparable<jet.Boolean> {
     /*primary*/ private constructor Boolean()
     public final fun and(/*0*/ other: jet.Boolean): jet.Boolean
+    public open override /*1*/ fun compareTo(/*0*/ other: jet.Boolean): jet.Int
     public final fun equals(/*0*/ other: jet.Any?): jet.Boolean
     public final fun not(): jet.Boolean
     public final fun or(/*0*/ other: jet.Boolean): jet.Boolean

compiler/testData/codegen/box/operatorConventions/compareTo/boolean.kt

@@ -0,0 +1,11 @@
+fun checkLess(x: Boolean, y: Boolean) = when {
+    x >= y    -> "Fail $x >= $y"
+    !(x < y)  -> "Fail !($x < $y)"
+    !(x <= y) -> "Fail !($x <= $y)"
+    x > y     -> "Fail $x > $y"
+    x.compareTo(y) >= 0 -> "Fail $x.compareTo($y) >= 0"
+    x compareTo y >= 0 -> "Fail $x compareTo $y  >= 0"
+    else -> "OK"
+}
+
+fun box() = checkLess(false, true)

compiler/testData/diagnostics/tests/library/BooleanIsNotComparable.kt

@@ -1,8 +0,0 @@
-fun foo(x: Boolean) {
-    x <!UNRESOLVED_REFERENCE!><<!> x
-    x <!UNRESOLVED_REFERENCE!><=<!> x
-    x <!UNRESOLVED_REFERENCE!>><!> x
-    x <!UNRESOLVED_REFERENCE!>>=<!> x
-    x == x
-    x.<!UNRESOLVED_REFERENCE!>compareTo<!>(x)
-}

compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java

@@ -4614,11 +4614,6 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/diagnostics/tests/library"), Pattern.compile("^(.+)\\.kt$"), true);
             }
             
-            @TestMetadata("BooleanIsNotComparable.kt")
-            public void testBooleanIsNotComparable() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/library/BooleanIsNotComparable.kt");
-            }
-            
             @TestMetadata("Collections.kt")
             public void testCollections() throws Exception {
                 doTest("compiler/testData/diagnostics/tests/library/Collections.kt");

compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxCodegenTestGenerated.java

@@ -4051,6 +4051,11 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/codegen/box/operatorConventions/compareTo"), Pattern.compile("^(.+)\\.kt$"), true);
             }
             
+            @TestMetadata("boolean.kt")
+            public void testBoolean() throws Exception {
+                doTest("compiler/testData/codegen/box/operatorConventions/compareTo/boolean.kt");
+            }
+            
             @TestMetadata("comparable.kt")
             public void testComparable() throws Exception {
                 doTest("compiler/testData/codegen/box/operatorConventions/compareTo/comparable.kt");

idea/builtinsSrc/jet/Library.kt

@@ -37,7 +37,7 @@ public trait Hashable {
   public fun equals(other : Any?) : Boolean
 }
 
-public class Boolean private () {
+public class Boolean private () : Comparable<Boolean> {
   public fun not() : Boolean
 
   public fun and(other : Boolean) : Boolean
@@ -46,6 +46,8 @@ public class Boolean private () {
 
   public fun xor(other : Boolean) : Boolean
 
+  public override fun compareTo(other : Boolean) : Int
+
   public fun equals(other : Any?) : Boolean
 }