summaryrefslogtreecommitdiff
path: root/test/files/pos/t2994a.scala
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2013-05-30 16:55:39 -0700
committerPaul Phillips <paulp@improving.org>2013-05-31 04:21:43 -0700
commit14534c693d2eb6acafaf8244c14b5643388fbd67 (patch)
tree20b5bb989a4629bc794e1c9fae591dd5d98ede10 /test/files/pos/t2994a.scala
parentcfef577e478161bd4d1e24626e0909c80c04e1b9 (diff)
downloadscala-14534c693d2eb6acafaf8244c14b5643388fbd67.tar.gz
scala-14534c693d2eb6acafaf8244c14b5643388fbd67.tar.bz2
scala-14534c693d2eb6acafaf8244c14b5643388fbd67.zip
SI-7517 type constructors too eagerly normalized.
I think 403eadd0f1 was largely a symptomatic remedy (not that we shouldn't harden against such outcomes) and that this commit gets closer to the root causes. The unanticipated change to test/files/run/t6113.check is like a cry of support from the jury box. -Foo[[X](Int, X)] +Foo[AnyRef{type l[X] = (Int, X)}#l] We should continue to look at calls to normalize with grave suspicion.
Diffstat (limited to 'test/files/pos/t2994a.scala')
-rw-r--r--test/files/pos/t2994a.scala8
1 files changed, 3 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
+}