Merge pull request #2615 from paulp/issue/7517

SI-7517 type constructors too eagerly normalized.

3 files changed, 33 insertions, 5 deletions

diff --git a/test/files/pos/t2994a.scala b/test/files/pos/t2994a.scala
index f2d57c34ca..15456991d0 100644
--- a/test/files/pos/t2994a.scala
+++ b/test/files/pos/t2994a.scala
@@ -17,11 +17,9 @@ object Naturals {
   type _5 = SUCC[_4]
   type _6 = SUCC[_5]
 
-  
-  // crashes scala-2.8.0 beta1  
+  // crashes scala-2.8.0 beta1
   trait MUL[n <: NAT, m <: NAT] extends NAT {
-    trait curry[n[_[_], _], s[_]] { type f[z <: NAT] = n[s, z] }
+    trait curry[ n[ m[x1 <: NAT], x2 <: NAT], s[x3 <: NAT] ] { type f[z <: NAT] = n[s, z] }
     type a[s[_ <: NAT] <: NAT, z <: NAT] = n#a[curry[m#a, s]#f, z]
   }
-
-}
\ No newline at end of file
+}
diff --git a/test/files/pos/t2994c.scala b/test/files/pos/t2994c.scala
new file mode 100644
index 0000000000..1ad3655c89
--- /dev/null
+++ b/test/files/pos/t2994c.scala
@@ -0,0 +1,8 @@
+object Test {
+  trait Bar[X[_]]
+  trait Qux[S[_] <: Bar[S], T]
+  trait Baz[S[_] <: Bar[S]] {
+    type Apply[T] = Qux[S,T]
+  }
+  trait Foo[/**/V[_] <: Bar[V]/**/] extends Bar[Baz[V]#Apply]
+}
diff --git a/test/files/pos/t7517.scala b/test/files/pos/t7517.scala
new file mode 100644
index 0000000000..29bd0936ce
--- /dev/null
+++ b/test/files/pos/t7517.scala
@@ -0,0 +1,22 @@
+trait Box[ K[A[x]] ]
+
+object Box {
+   // type constructor composition
+   sealed trait ∙[A[_], B[_]] { type l[T] = A[B[T]] }
+
+   // composes type constructors inside K
+   type SplitBox[K[A[x]], B[x]] = Box[ ({ type l[A[x]] = K[ (A ∙ B)#l] })#l ]
+
+   def split[ K[A[x]], B[x] ](base: Box[K]): SplitBox[K,B] = ???
+
+   class Composed[B[_], K[A[x]] ] {
+      val box: Box[K] = ???
+
+      type Split[ A[x] ] = K[ (A ∙ B)#l ]
+      val a: Box[Split] = Box.split(box)
+
+      //Either of these work:
+      //val a: Box[Split] = Box.split[K,B](box)
+      //val a: Box[ ({ type l[A[x]] = K[ (A ∙ B)#l ] })#l ] = Box.split(box)
+   }
+}