From 278305a7f60c46515c2133d11f7c561e972ef705 Mon Sep 17 00:00:00 2001
From: Paul Phillips <paulp@improving.org>
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/neg/t2994a.check |  7 -------
 test/files/neg/t2994a.scala | 27 ---------------------------
 2 files changed, 34 deletions(-)
 delete mode 100644 test/files/neg/t2994a.check
 delete mode 100644 test/files/neg/t2994a.scala

(limited to 'test/files/neg')

diff --git a/test/files/neg/t2994a.check b/test/files/neg/t2994a.check
deleted file mode 100644
index 24538a50c3..0000000000
--- a/test/files/neg/t2994a.check
+++ /dev/null
@@ -1,7 +0,0 @@
-t2994a.scala:24: error: kinds of the type arguments (m#a,s) do not conform to the expected kinds of the type parameters (type n,type s) in trait curry.
-m#a's type parameters do not match type n's expected parameters:
-type _'s bounds <: Naturals.NAT are stricter than type _'s declared bounds >: Nothing <: Any, type z's bounds <: Naturals.NAT are stricter than type _'s declared bounds >: Nothing <: Any, s's type parameters do not match type s's expected parameters:
-type _'s bounds <: Naturals.NAT are stricter than type _ (in trait curry)'s declared bounds >: Nothing <: Any
-    type a[s[_ <: NAT] <: NAT, z <: NAT] = n#a[curry[m#a, s]#f, z]
-                                             ^
-one error found
diff --git a/test/files/neg/t2994a.scala b/test/files/neg/t2994a.scala
deleted file mode 100644
index f2d57c34ca..0000000000
--- a/test/files/neg/t2994a.scala
+++ /dev/null
@@ -1,27 +0,0 @@
-object Naturals {
-  trait NAT {
-    type a[s[_ <: NAT] <: NAT, z <: NAT] <: NAT
-    type v = a[SUCC, ZERO]
-  }
-  final class ZERO extends NAT {
-    type a[s[_ <: NAT] <: NAT, z <: NAT] = z
-  }
-  final class SUCC[n <: NAT] extends NAT {
-    type a[s[_ <: NAT] <: NAT, z <: NAT] = s[n#a[s, z]]
-  }
-  type _0 = ZERO
-  type _1 = SUCC[_0]
-  type _2 = SUCC[_1]
-  type _3 = SUCC[_2]
-  type _4 = SUCC[_3]
-  type _5 = SUCC[_4]
-  type _6 = SUCC[_5]
-
-  
-  // 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] }
-    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