KT-286 Check supertype lists (in progress)

Tests involving multiple inheritance fixed
2011-09-08 15:34:05 +04:00
parent 5cb298c093
commit 71bc41a938
22 changed files with 189 additions and 78 deletions
@@ -49,7 +49,7 @@ namespace html {

  class Title() : TagWithText("title")

-  class BodyTag(name : String) : TagWithText(name) {
+  abstract class BodyTag(name : String) : TagWithText(name) {
  }

  class Body() : BodyTag("body") {
@@ -1,9 +1,9 @@

-class NoC
+open class NoC
 class NoC1 : NoC

 class WithC0() : NoC<error>()</error>
-class WithC1() : NoC
+open class WithC1() : NoC
 class NoC2 : <error>WithC1</error>
 class NoC3 : WithC1<error>()</error>
 class WithC2() : <error>WithC1</error>
@@ -4,14 +4,14 @@ open class A() {
  fun foo() : Int = 1
 }

-open class B() {
+trait class B {
  fun bar() : Double = 1.0;
 }

-class C() : A(), B()
+class C() : A(), B

 class D() {
-  class object : A(), B () {}
+  class object : A(), B {}
 }

 class Test1<T : A>()
@@ -61,7 +61,7 @@ fun <T : A> test2(t : T)
 }

 val t1 = test2<<error>A</error>>(A())
-val t2 = test2<<error>B</error>>(B())
+val t2 = test2<<error>B</error>>(C())
 val t3 = test2<C>(C())

 class Test<<error>T</error>>
@@ -1,5 +1,5 @@
 namespace toplevelObjectDeclarations {
-  class Foo(y : Int) {
+  open class Foo(y : Int) {
    virtual fun foo() : Int = 1
  }

@@ -63,7 +63,7 @@ namespace localObjects {
    val x : Int = 0
  }

-  class Foo {
+  open class Foo {
    fun foo() : Int = 1
  }

@@ -2,7 +2,7 @@ class <error>X</error> {
  val <error>x</error> : Int
 }

-class Y() {
+open class Y() {
  val x : Int = 2
 }

@@ -0,0 +1,51 @@
+// KT-286 Check supertype lists
+
+/*
+In a supertype list:
+ Same type should not be mentioned twice
+ Same type should not be indirectly mentioned with incoherent type arguments
+ Every trait's required dependencies should be satisfied
+ No final types should appear
+ Only one class is allowed
+*/
+
+class C1()
+
+open class OC1()
+
+open class C2 {}
+
+open class C3 {}
+
+trait class T1 {}
+
+trait class T2<T> {}
+
+trait class Test<error>()</error> {
+    <error>this</error>(x : Int) {}
+}
+
+trait class Test1 : C2<error>()</error> {}
+
+trait class Test2 : C2 {}
+
+trait class Test3 : C2, <error>C3</error> {}
+
+trait class Test4 : T1 {}
+
+trait class Test5 : T1, <error>T1</error> {}
+
+trait class Test6 : <error>C1</error> {}
+
+class CTest1() : OC1() {}
+
+class CTest2 : C2 {}
+
+class CTest3 : C2, <error>C3</error> {}
+
+class CTest4 : T1 {}
+
+class CTest5 : T1, <error>T1</error> {}
+
+class CTest6 : <error>C1</error> {}
+
@@ -1,11 +1,11 @@
-class bar()
+open class bar()

-trait open class Foo<error>()</error> : bar<error>()</error>, bar, <error>bar</error> {
+trait open class Foo<error>()</error> : bar<error>()</error>, <error>bar</error>, <error>bar</error> {
    <error>this</error>(x : Int) {}
 }

 trait open class Foo2 : bar, Foo {
 }

-open class Foo1() : bar(), <error>bar</error>, Foo, Foo<error>()</error> {}
+open class Foo1() : bar(), <error>bar</error>, Foo, <error>Foo</error><error>()</error> {}
 open class Foo12 : bar<error>()</error>, <error>bar</error> {}
@@ -1,4 +1,4 @@
-class A() {
+<info>open</info> class A() {
  fun foo() {}
 }

@@ -1,4 +1,4 @@
 // JET-11 Redeclaration & Forward reference for classes cause an exception
-class <error>NoC</error>
+open class <error>NoC</error>
 class NoC1 : NoC
-class <error>NoC</error>
+open class <error>NoC</error>
@@ -1,6 +1,6 @@
 import java.lang.Integer

-class C {
+open class C {
 fun f(): Any = "C f"
 }

@@ -1,11 +1,13 @@
-class Base() {
+// Changed when traits were introduced. May not make sense any more
+
+open class Base() {
    public var v : Int = 0
 }

-class Left() : Base() {}
-class Right() : Base() {}
+open class Left() : Base() {}
+trait class Right : Base {}

-class D() : Left(), Right()
+class D() : Left(), Right

 fun vl(l : Left) : Int = l.v
 fun vr(r : Right) : Int = r.v
@@ -1,8 +1,8 @@
-class Base() {
+open class Base() {
    fun n(n : Int) : Int = n + 1
 }

-class Abstract {}
+trait class Abstract {}

 class Derived1() : Base(), Abstract {}
 class Derived2() : Abstract, Base() {}
@@ -1,9 +1,17 @@
-class X(val x : Int) {}
-class Y(val y : Int) {}
+// Changed when traits were introduced. May not make sense any more

-class Point(x : Int, y : Int) : X(x) , Y(y) {}
+open class X(val x : Int) {}
+trait class Y {
+    abstract val y : Int
+}

-class Abstract {}
+class YImpl(val y : Int) : Y {}
+
+class Point(x : Int, yy : Int) : X(x) , Y {
+    override val y : Int = yy
+}
+
+trait class Abstract {}

 class P1(x : Int, yy : Y) : Abstract, X(x), Y by yy {}
 class P2(x : Int, yy : Y) : X(x), Abstract, Y by yy {}
@@ -12,12 +20,12 @@ class P4(x : Int, yy : Y) : Y by yy, Abstract, X(x) {}

 fun box() : String {
    if (X(239).x != 239) return "FAIL #1"
-    if (Y(239).y != 239) return "FAIL #2"
+    if (YImpl(239).y != 239) return "FAIL #2"

    val p = Point(240, -1)
    if (p.x + p.y != 239) return "FAIL #3"

-    val y = Y(-1)
+    val y = YImpl(-1)
    val p1 = P1(240, y)
    if (p1.x + p1.y != 239) return "FAIL #4"
    val p2 = P2(240, y)
@@ -1,5 +1,5 @@
 class Outer() {
-  class InnerBase() {
+  open class InnerBase() {
  }

  class InnerDerived(): InnerBase() {
@@ -1,4 +1,4 @@
-class Foo {
+open class Foo {
  fun xyzzy(): String = "xyzzy"
 }

@@ -1,4 +1,4 @@
-class Base() {
+open class Base() {
    public val plain = 239
    public val read : Int
      get() = 239
@@ -10,7 +10,7 @@ class Base() {
      }
 }

-class Abstract {}
+trait class Abstract {}

 class Derived1() : Base(), Abstract {}
 class Derived2() : Abstract, Base() {}
@@ -1,7 +1,7 @@
 class Outer() {
  public val s = "xyzzy"

-  class InnerBase(public val name: String) {
+  open class InnerBase(public val name: String) {
  }

  class InnerDerived(): InnerBase(s) {
@@ -1,9 +1,11 @@
-class Left() {}
-class Right() {
+// Changed when traits were introduced. May not make sense any more
+
+trait class Left {}
+open class Right() {
    virtual fun f() = 42
 }

-class D() : Left(), Right() {
+class D() : Left, Right() {
    override fun f() = 239
 }