Add more tests

Add more tests cases for generic signatures

Add disabled tests with inner classes, traits, enums, etc.

Author: timotheeandres

compiler/src/dotty/tools/dotc/transform/Inlining.scala

@@ -15,6 +15,7 @@ import dotty.tools.dotc.core.DenotTransformers.SymTransformer
 import dotty.tools.dotc.staging.StagingLevel
 import dotty.tools.dotc.core.SymDenotations.SymDenotation
 import dotty.tools.dotc.core.StdNames.str
+import dotty.tools.dotc.core.Types.TypeBounds
 
 import scala.collection.mutable.ListBuffer
 
@@ -75,7 +76,7 @@ class Inlining extends MacroTransform, SymTransformer {
           owner = tree.symbol,
           name = name.asTypeName,
           flags = tdef.symbol.flags & (Private | Protected),
-          info = Types.TypeBounds.upper(newTrait.symbol.typeRef),
+          info = TypeBounds.upper(newTrait.symbol.typeRef),
           privateWithin = tdef.symbol.privateWithin,
           coord = tdef.symbol.coord,
           nestingLevel = tdef.symbol.nestingLevel,

tests/disabled/pos/inline-trait-body-class-generic.scala

@@ -1,6 +1,6 @@
-inline trait A:
-  class Inner[T <: Int]:
-    val x: T = 1
+inline trait A[T]:
+  class Inner[U](u: U):
+    val x: (T, U) = (???, u)
+  def f: (T, String) = Inner("U").x
 
-class B extends A:
-  def f = Inner[Int]().x
+class B extends A[Int]

tests/disabled/pos/inline-trait-inheritance-multiple-override.scala

@@ -0,0 +1,20 @@
+inline trait IT1:
+  def i: Int = 1
+  def f[T](x: T): T = x
+
+inline trait IT2:
+  def j: String = "inline"
+  def g(x: Int): String = x.toString()
+
+trait T:
+  def k: List[Nothing]
+  def h(x: Int, y: Double): Double = x + y
+
+class C1 extends IT1, T:
+  override def i: Int = 123456
+  def k = Nil
+  override def h(x: Int, y: Double): Double = 1.0
+
+class C2 extends IT1, IT2:
+  override def i: Int = 567890
+  override def f[T](x: T): T = ???

tests/disabled/pos/inline-trait-inheritance-multiple.scala

@@ -0,0 +1,17 @@
+object InlineTraits:
+  inline trait IT1:
+    def i: Int = 1
+    def f[T](x: T): T = x
+
+  inline trait IT2:
+    def j: String = "inline"
+    def g(x: Int): String = x.toString()
+
+trait T:
+  def k: List[Nothing]
+  def h(x: Int, y: Double): Double = x + y
+
+class C1 extends InlineTraits.IT1, T:
+  def k = Nil
+
+class C2 extends InlineTraits.IT1, InlineTraits.IT2

tests/disabled/pos/inline-trait-inheritance-single-abstract-class-override.scala

@@ -0,0 +1,7 @@
+inline trait IT:
+  def i: Int = 1
+  def f[T](x: T): T = x
+
+abstract class AC extends IT:
+  override def i: Int = 123456
+  def j: Int

tests/disabled/pos/inline-trait-inheritance-single-abstract-class.scala

@@ -0,0 +1,6 @@
+inline trait IT:
+  def i: Int = 1
+  def f[T](x: T): T = x
+
+abstract class AC extends IT:
+  def j: Int

tests/disabled/pos/inline-trait-inheritance-single-object-override.scala

@@ -0,0 +1,6 @@
+inline trait IT:
+  def i: Int = 1
+  def f[T](x: T): T = x
+
+object O extends IT:
+  override def i: Int = 123456

tests/disabled/pos/inline-trait-inheritance-single-object.scala

@@ -0,0 +1,5 @@
+inline trait IT:
+  def i: Int = 1
+  def f[T](x: T): T = x
+
+object O extends IT

tests/pos/inline-trait-signature-generic-refinement-type.scala

@@ -0,0 +1,9 @@
+import reflect.Selectable.reflectiveSelectable
+
+class C[T](x: T):
+  def foo(): T = x
+
+inline trait A[T, U[T]](u: U[T]{ def foo(): T }):
+  def f: T = u.foo()
+
+class B extends A(C(1))

tests/pos/inline-trait-signature-generic-singleton.scala

@@ -0,0 +1,4 @@
+inline trait A[T](x: T):
+  def f: T = x
+
+class B extends A[1](1)

tests/pos/inline-trait-signature-parameters-currying.scala

@@ -0,0 +1,4 @@
+inline trait A(i: Int)(j: Double):
+  def f: Double = i + j
+
+class B extends A(1)(1.0)

tests/pos/inline-trait-signature-parentheses.scala

@@ -0,0 +1,4 @@
+inline trait A():
+  def i: Int = 1
+
+class B extends A

tests/pos/inline-trait-usage-inner.scala

@@ -0,0 +1,5 @@
+object O:
+  inline trait A[T]:
+    def t: T = ???
+
+class B extends O.A[Int]

tests/run/inline-trait-inheritance-diamond-simple-trait.check

@@ -0,0 +1,4 @@
+1
+2
+999
+4

tests/run/inline-trait-inheritance-diamond-simple-trait.scala

@@ -0,0 +1,22 @@
+trait TGP[T]:
+  def i: T
+  def f(x: T): T = x
+
+inline trait IT1[T](x: T) extends TGP[T]:
+  override def i: T = x
+
+inline trait IT2 extends TGP[Int]:
+  override def i: Int = 999
+  def j: String = "inline"
+  def g(x: Int): String = x.toString()
+
+trait T extends TGP[Int]
+
+class C1 extends T, IT1[Int](1)
+class C2 extends IT1[Int](2), T
+class C3 extends IT1[Int](3), IT2
+class C4 extends IT2, IT1[Int](4)
+
+@main def Test: Unit =
+  for c <- List(C1(), C2(), C3(), C4())
+  do println(c.i)