From 278305a7f60c46515c2133d11f7c561e972ef705 Mon Sep 17 00:00:00 2001 From: Paul Phillips Date: Mon, 3 Jun 2013 21:23:30 -0700 Subject: Revert "SI-7517 type constructors too eagerly normalized." This reverts commit 14534c693d2eb6acafaf8244c14b5643388fbd67. It turns out this approach was breaking the working variations in the submitted test case even as it was unbreaking the unworking one, but I never managed to uncomment them. Fortunately retronym's test case was not so lackadaisical. --- test/files/pos/t2994a.scala | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'test/files/pos/t2994a.scala') diff --git a/test/files/pos/t2994a.scala b/test/files/pos/t2994a.scala index 15456991d0..f2d57c34ca 100644 --- a/test/files/pos/t2994a.scala +++ b/test/files/pos/t2994a.scala @@ -17,9 +17,11 @@ 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[ m[x1 <: NAT], x2 <: NAT], s[x3 <: NAT] ] { type f[z <: NAT] = n[s, z] } + trait curry[n[_[_], _], s[_]] { 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 -- cgit v1.2.3