'test-nsc' has been moved to 'test'.

150 files changed, 0 insertions, 3110 deletions

diff --git a/test-nsc/files/pos/304.scala b/test-nsc/files/pos/304.scala
deleted file mode 100644
index 607a115db2..0000000000
--- a/test-nsc/files/pos/304.scala
+++ /dev/null
@@ -1,5 +0,0 @@
-object O {
-  def f1 = -1;
-  def f2 = 0-1;
-  def f3 = f1 + f2;
-}
diff --git a/test-nsc/files/pos/A.scala b/test-nsc/files/pos/A.scala
deleted file mode 100644
index fc50379d88..0000000000
--- a/test-nsc/files/pos/A.scala
+++ /dev/null
@@ -1,8 +0,0 @@
-trait A extends java.lang.Object {}
-
-object test {
-
-  def x: A = x;
-
-}
-
diff --git a/test-nsc/files/pos/List1.scala b/test-nsc/files/pos/List1.scala
deleted file mode 100644
index 1321d95c20..0000000000
--- a/test-nsc/files/pos/List1.scala
+++ /dev/null
@@ -1,45 +0,0 @@
-object lists {
-
-  abstract class List[a] {
-      def isEmpty: Boolean;
-      def head: a;
-      def tail: List[a];
-      def prepend(x: a) = Cons[a](x, this);
-  }
-
-  def Nil[b] = new List[b] {
-    def isEmpty: Boolean = true;
-    def head = error("head of Nil");
-    def tail = error("tail of Nil");
-  }
-
-  def Cons[c](x: c, xs: List[c]): List[c] = new List[c] {
-    def isEmpty = false;
-    def head = x;
-    def tail = xs;
-  }
-
-  def foo = {
-    val intnil = Nil[Int];
-    val intlist = intnil.prepend(1).prepend(1+1);
-    val x: Int = intlist.head;
-    val strnil = Nil[String];
-    val strlist = strnil.prepend("A").prepend("AA");
-    val y: String = strlist.head;
-    ()
-  }
-
-  class IntList() extends List[Int] {
-    def isEmpty: Boolean = false;
-    def head: Int = 1;
-    def foo: List[Int] { def isEmpty: Boolean; def head: Int; def tail: List[Int] } = Nil[Int];
-    def tail0: List[Int] = foo.prepend(1).prepend(1+1);
-    def tail: List[Int] = Nil[Int].prepend(1).prepend(1+1);
-  }
-
-  def foo2 = {
-    val il1 = new IntList();
-    val il2 = il1.prepend(1).prepend(2);
-    ()
-  }
-}
diff --git a/test-nsc/files/pos/MailBox.scala b/test-nsc/files/pos/MailBox.scala
deleted file mode 100644
index b1ea818f60..0000000000
--- a/test-nsc/files/pos/MailBox.scala
+++ /dev/null
@@ -1,83 +0,0 @@
-package test;
-
-import scala.concurrent._;
-
-class MailBox {
-  private class LinkedList[a] {
-    var elem: a = _;
-    var next: LinkedList[a] = null;
-  }
-
-  private def insert[a](l: LinkedList[a], x: a): LinkedList[a] = {
-    l.next = new LinkedList[a];
-    l.next.elem = x;
-    l.next.next = l.next;
-    l
-  }
-
-  private abstract class Receiver {
-    def isDefined(msg: Any): boolean;
-    var msg: Any = null;
-  }
-
-  private val sent = new LinkedList[Any];
-  private var lastSent = sent;
-  private val receivers = new LinkedList[Receiver];
-  private var lastReceiver = receivers;
-
-  def send(msg: Any): unit = synchronized {
-    var r = receivers;
-    var r1 = r.next;
-    while (r1 != null && !r1.elem.isDefined(msg)) {
-      r = r1; r1 = r1.next;
-    }
-    if (r1 != null) {
-      r.next = r1.next; r1.elem.msg = msg; r1.elem.notify();
-    } else {
-      lastSent = insert(lastSent, msg);
-    }
-  }
-
-  def receive[a](f: PartialFunction[Any, a]): a = {
-    val msg: Any = synchronized {
-      var s = sent;
-      var s1 = s.next;
-      while (s1 != null && !f.isDefinedAt(s1.elem)) {
-        s = s1; s1 = s1.next
-      }
-      if (s1 != null) {
-        s.next = s1.next; s1.elem
-      } else {
-	val r = insert(lastReceiver, new Receiver {
-          def isDefined(msg: Any) = f.isDefinedAt(msg);
-        });
-	lastReceiver = r;
-        r.elem.wait();
-        r.elem.msg
-      }
-    }
-    f(msg)
-  }
-
-  def receiveWithin[a](msec: long)(f: PartialFunction[Any, a]): a = {
-    val msg: Any = synchronized {
-      var s = sent;
-      var s1 = s.next;
-      while (s1 != null && !f.isDefinedAt(s1.elem)) {
-        s = s1; s1 = s1.next ;
-      }
-      if (s1 != null) {
-        s.next = s1.next; s1.elem
-      } else {
-        val r = insert(lastReceiver, new Receiver {
-            def isDefined(msg: Any) = f.isDefinedAt(msg);
-        });
-        lastReceiver = r;
-        r.elem.wait(msec);
-        if (r.elem.msg == null) r.elem.msg = TIMEOUT;
-        r.elem.msg
-      }
-    }
-    f(msg)
-  }
-}
diff --git a/test-nsc/files/pos/S1.scala b/test-nsc/files/pos/S1.scala
deleted file mode 100644
index 68706e3dd3..0000000000
--- a/test-nsc/files/pos/S1.scala
+++ /dev/null
@@ -1,13 +0,0 @@
-/* This is probably no bug, I just don't understand why
-** type inference does not find the right instantiation of foo.
-** Currently it reports:
-**
-** S1.scala:12: inferred type arguments [S1] do not conform to
-** method foo's type parameter bounds [T <: S1.this.type]
-**        foo(this);
-**           ^
-*/
-class S1() {
-    def foo[T <: this.type](x: T) = x;
-    foo[this.type](this);
-}
diff --git a/test-nsc/files/pos/S3.scala b/test-nsc/files/pos/S3.scala
deleted file mode 100644
index 1e0f0288b1..0000000000
--- a/test-nsc/files/pos/S3.scala
+++ /dev/null
@@ -1,14 +0,0 @@
-/* Why does this code fail? b has type a.type, so the third
-** declaration in S3 should be okay... The compiler writes instead:
-**
-** found   : S3.this.b.type (with underlying type S3)
-** required: S3.this.a.type
-**        val c: a.type = b;
-**                        ^
-** Without declaration 3, everything is fine.
-*/
-class S3() {
-    val a = new S3();
-    val b: a.type = a;
-    val c: a.type = b;
-}
diff --git a/test-nsc/files/pos/S5.scala b/test-nsc/files/pos/S5.scala
deleted file mode 100644
index f0b66a6e68..0000000000
--- a/test-nsc/files/pos/S5.scala
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Here's a fragment of a Scala encoding for the Keris module system;
-** the compiler claims:
-**
-** S5.scala:28: value n in class N of type N.this._N.n
-** cannot override value n in class M of type M.this._N.n
-**        val system = new M() with N() {}
-**                         ^
-** To me it seems like the code is perfectly fine...
-*/
-abstract class M() {
-    val _N: N;
-    val n: _N.n;
-    val _M: M = this;
-    val m: _M.m = new _M.m();
-    class m() {
-        // module body of M
-    }
-}
-trait N {
-    val _N: N = this;
-    val n: _N.n = new _N.n();
-    val _M: M;
-    val m: _M.m;
-    class n() {
-        // module body of N
-    }
-}
-object O {
-    val system = new M() with N {}
-}
diff --git a/test-nsc/files/pos/S8.scala b/test-nsc/files/pos/S8.scala
deleted file mode 100644
index 50f1df27a2..0000000000
--- a/test-nsc/files/pos/S8.scala
+++ /dev/null
@@ -1,19 +0,0 @@
-/* I believe this code is correct, but the compiler rejects it:
-**
-** S8.scala:18: type mismatch;
-** found   : M.x.A
-** required: M.x.a.B
-**        val y: x.a.B = new x.A(); //correct?
-**                              ^
-** For a given value x of type S8, type x.A should be
-** a subtype of x.a.B.
-*/
-class S8() {
-    val a: S8 = this;
-    class A() extends a.B() {}
-    class B() {}
-}
-object M {
-    val x = new S8();
-    val y: x.a.B = new x.A(); //correct?
-}
diff --git a/test-nsc/files/pos/X.scala b/test-nsc/files/pos/X.scala
deleted file mode 100644
index 2edf010efd..0000000000
--- a/test-nsc/files/pos/X.scala
+++ /dev/null
@@ -1,14 +0,0 @@
-abstract class A() {
-
-  var x: Int
-
-}
-
-abstract class B() extends A() {
-
-  var xx: Int = 0;
-
-  def x = xx;
-  def x_=(y: Int) = xx = y;
-}
-
diff --git a/test-nsc/files/pos/Z.scala b/test-nsc/files/pos/Z.scala
deleted file mode 100644
index c1367e46b9..0000000000
--- a/test-nsc/files/pos/Z.scala
+++ /dev/null
@@ -1,10 +0,0 @@
-trait X {
-  val elem: Int = 1
-}
-
-object test {
-
-  def g(x: X) = x.elem;
-  def f(x: Object) = x.toString();
-
-}
diff --git a/test-nsc/files/pos/abstract.scala b/test-nsc/files/pos/abstract.scala
deleted file mode 100644
index 533f996931..0000000000
--- a/test-nsc/files/pos/abstract.scala
+++ /dev/null
@@ -1,9 +0,0 @@
-abstract class C() {
-  type t;
-  def copy(x: t): t = x;
-}
-
-class D() extends C() {
-  type t = Int;
-  System.out.println(copy(1));
-}
diff --git a/test-nsc/files/pos/aliases.scala b/test-nsc/files/pos/aliases.scala
deleted file mode 100644
index b746a35861..0000000000
--- a/test-nsc/files/pos/aliases.scala
+++ /dev/null
@@ -1,25 +0,0 @@
-abstract class C() {
-
-  type t <: C;
-
-  val x: t;
-  val y: x.type;
-  val z: x.type;
-  val u: z.type;
-
-  val xt: x.t;
-  val yt: y.t;
-  val zt: z.t;
-  val ut: z.t;
-
-  def fx(a: x.t): Unit;
-  def fy(a: y.t): Unit;
-  def fz(a: z.t): Unit;
-  def fu(a: u.t): Unit;
-
-  fx(xt); fx(yt); fx(zt); fx(ut);
-  fy(xt); fy(yt); fy(zt); fy(ut);
-  fz(xt); fz(yt); fz(zt); fz(ut);
-  fu(xt); fu(yt); fu(zt); fu(ut);
-
-}
diff --git a/test-nsc/files/pos/all.lst b/test-nsc/files/pos/all.lst
deleted file mode 100644
index db9b9813dd..0000000000
--- a/test-nsc/files/pos/all.lst
+++ /dev/null
@@ -1,143 +0,0 @@
-304.scala
-A.scala
-List1.scala
-MailBox.scala
-S1.scala
-S3.scala
-S5.scala
-S8.scala
-X.scala
-Z.scala
-abstract.scala
-aliases.scala
-arrays2.scala
-attributes.scala
-bug082.scala
-bug1.scala
-bug115.scala
-bug116.scala
-bug119.scala
-bug121.scala
-bug123.scala
-bug124.scala
-bug151.scala
-bug159.scala
-bug160.scala
-bug17.scala
-bug175.scala
-bug177.scala
-bug183.scala
-bug193.scala
-bug2.scala
-bug20.scala
-bug201.scala
-bug204.scala
-bug210.scala
-bug211.scala
-bug229.scala
-bug245.scala
-bug267.scala
-bug287.scala
-bug289.scala
-bug29.scala
-bug295.scala
-bug30.scala
-bug304.scala
-bug31.scala
-bug318.scala
-bug32.scala
-bug342.scala
-bug348plus.scala
-bug359.scala
-bug36.scala
-bug360.scala
-bug361.scala
-bug372.scala
-bug39.scala
-bug49.scala
-bug53.scala
-bug54.scala
-bug61.scala
-bug64.scala
-bug66.scala
-bug68.scala
-bug69.scala
-bug76.scala
-bug81.scala
-bug85.scala
-bug91.scala
-bug93.scala
-cls.scala
-cls1.scala
-clsrefine.scala
-compile.scala
-compound.scala
-constfold.scala
-context.scala
-eta.scala
-exceptions.scala
-expressions-current.scala
-gui.scala
-imports.scala
-infer.scala
-infer2.scala
-lambda.scala
-lambdalift.scala
-lambdalift1.scala
-localmodules.scala
-matthias1.scala
-matthias3.scala
-matthias4.scala
-matthias5.scala
-maxim1.scala
-michel1.scala
-michel2.scala
-michel3.scala
-michel4.scala
-michel5.scala
-michel6.scala
-mixins.scala
-modules.scala
-modules1.scala
-moduletrans.scala
-nested.scala
-null.scala
-orderedpoints.scala
-override.scala
-partialfun.scala
-patterns.scala
-patterns1.scala
-patterns2.scala
-patterns3.scala
-philippe1.scala
-philippe2.scala
-philippe3.scala
-philippe4.scala
-pmbug.scala
-propagate.scala
-rebind.scala
-refine.scala
-reftest.scala
-scall.bat
-scoping1.scala
-scoping2.scala
-scoping3.scala
-seqtest2.scala
-simplelists.scala
-stable.scala
-strings.scala
-test1.scala
-test2.scala
-test4.scala
-test4a.scala
-test4refine.scala
-test5.scala
-test5refine.scala
-testcast.scala
-thistype.scala
-thistypes.scala
-traits.scala
-valdefs.scala
-viewtest1.scala
-viewtest2.scala
-viewtest3.scala
diff --git a/test-nsc/files/pos/arrays2.scala b/test-nsc/files/pos/arrays2.scala
deleted file mode 100644
index 6f4a09a401..0000000000
--- a/test-nsc/files/pos/arrays2.scala
+++ /dev/null
@@ -1,11 +0,0 @@
-case class C();
-
-object arrays2 {
-
-  def main(args: Array[String]): Unit = {
-    val a: Array[Array[C]] = new Array[Array[C]](2);
-    a(0) = new Array[C](2);
-    a(0)(0) = new C();
-  }
-}
-
diff --git a/test-nsc/files/pos/attributes.scala b/test-nsc/files/pos/attributes.scala
deleted file mode 100644
index ab30e2cdeb..0000000000
--- a/test-nsc/files/pos/attributes.scala
+++ /dev/null
@@ -1,74 +0,0 @@
-/* $Id$ */
-
-[serializable] class C1;
-[serializable,volatile] class C2;
-[serializable][volatile] class C3;
-[serializable][volatile,serializable] class C4;
-
-[serializable] trait T1;
-[serializable,volatile] trait T2;
-[serializable][volatile] trait T3;
-[serializable][volatile,serializable] trait T4;
-
-[serializable] object O1 extends C1;
-[serializable,volatile] object O2 extends C2;
-[serializable][volatile] object O3 extends C3;
-[serializable][volatile,serializable] object O4 extends C4;
-
-object O5 {
-  final val n = 2;
-  [SerialVersionUID(0)] class C1;
-  [SerialVersionUID(n)] class C2;
-  [SerialVersionUID(0),SerialVersionUID(n)] class C3;
-  [SerialVersionUID(0)][SerialVersionUID(n)] class C4;
-}
-
-abstract class A1 {
-  [serializable] var y1: C1;
-  [serializable,volatile] var y2: C2;
-  [serializable][volatile] var y3: C3;
-  [serializable][volatile,serializable] var y4: C4;
-
-  [serializable] def foo1: C1;
-  [serializable,volatile] def foo2: C2;
-  [serializable][volatile] def foo3: C3;
-  [serializable][volatile,serializable] def foo4: C4;
-}
-
-object O6 {
-  [serializable] val x1 = new C1;
-  [serializable,volatile] val x2 = new C2;
-  [serializable][volatile] val x3 = new C3;
-  [serializable][volatile,serializable] val x4 = new C4;
-
-  [serializable] var y1: C1 = _;
-  [serializable,volatile] var y2: C2 = _;
-  [serializable][volatile] var y3: C3 = _;
-  [serializable][volatile,serializable] var y4: C4 = _;
-
-  [serializable] private def foo1 = x1;
-  [serializable,volatile] private def foo2 = x2;
-  [serializable][volatile] protected def foo3 = x3;
-  [serializable][volatile,serializable] protected def foo4 = x4;
-}
-
-object myAttrs {
-  class a1 extends scala.Attribute;
-  class a2(x: Int) extends scala.Attribute;
-  class a3(x: a1) extends scala.Attribute;
-}
-object O7 {
-  class a1 extends scala.Attribute;
-  class a2(x: Int) extends scala.Attribute;
-  class a3(x: a1) extends scala.Attribute;
-  final val x = new a1;
-  [a1] class C1;
-  [a1,a2(77)] class C2;
-  [a1][a2(88)] class C3;
-  [a1][a2(88),a3(null)] class C4;
-
-  [myAttrs.a1] class A1;
-  [myAttrs.a1,myAttrs.a2(99)] class A2;
-  [myAttrs.a1][myAttrs.a2(99)] class A3;
-  [myAttrs.a1][myAttrs.a2(99),myAttrs.a3(null)] class A4;
-}
diff --git a/test-nsc/files/pos/bug082.scala b/test-nsc/files/pos/bug082.scala
deleted file mode 100644
index 594c9fdc86..0000000000
--- a/test-nsc/files/pos/bug082.scala
+++ /dev/null
@@ -1,18 +0,0 @@
-
-object Main {
-
-    def min0[A](less: (A, A) => Boolean, xs: List[A]): Option[A] = xs match {
-        case List()  => None
-        case List(x) => Some(x)
-//      case x :: Nil => Some(x)
-        case y :: ys => min0(less, ys) match {
-            case Some(m) => if (less(y, m)) Some(y) else Some(m)
-        }
-    }
-
-    def min(xs: List[Int]) = min0((x: Int, y: Int) => x < y, xs);
-
-    def main(args: Array[String]) =
-        System.out.println(min(List()));
-
-}
diff --git a/test-nsc/files/pos/bug1.scala b/test-nsc/files/pos/bug1.scala
deleted file mode 100644
index bdf33ef20d..0000000000
--- a/test-nsc/files/pos/bug1.scala
+++ /dev/null
@@ -1,8 +0,0 @@
-object Exceptions {
-
-    class CubeException(s: String) extends java.lang.RuntimeException(s);
-
-    def main(args: Array[String]) =
-        System.out.println(new CubeException("test"));
-
-}
diff --git a/test-nsc/files/pos/bug115.scala b/test-nsc/files/pos/bug115.scala
deleted file mode 100644
index a250e3c090..0000000000
--- a/test-nsc/files/pos/bug115.scala
+++ /dev/null
@@ -1,9 +0,0 @@
-class S[A](f: A => A, x: A) {
-  System.out.println(f(x));
-}
-class T[B](f: B => B, y: B) extends S(x: B => f(x), y) {
-}
-object Test extends Application {
-  new T[Int](x => x * 2, 1);
-  val f = new S(x: Int => x, 1);
-}
diff --git a/test-nsc/files/pos/bug116.scala b/test-nsc/files/pos/bug116.scala
deleted file mode 100644
index b02c81f0b7..0000000000
--- a/test-nsc/files/pos/bug116.scala
+++ /dev/null
@@ -1,8 +0,0 @@
-// $Id$
-
-class C {
-  def this(x: Int) = {
-    this();
-    class D extends C;
-  }
-}
diff --git a/test-nsc/files/pos/bug119.scala b/test-nsc/files/pos/bug119.scala
deleted file mode 100644
index e3f0993862..0000000000
--- a/test-nsc/files/pos/bug119.scala
+++ /dev/null
@@ -1,7 +0,0 @@
-class K[E] {
-  case class A(v:E){};
-}
-
-class K2 extends K[int] {
-  val A(v) = A(42);
-}
diff --git a/test-nsc/files/pos/bug121.scala b/test-nsc/files/pos/bug121.scala
deleted file mode 100644
index 78ddc41ee5..0000000000
--- a/test-nsc/files/pos/bug121.scala
+++ /dev/null
@@ -1,3 +0,0 @@
-class Bug121_B(b: Array[Byte]) {
-  def get(x: Int): Byte = return b(x);
-}
diff --git a/test-nsc/files/pos/bug123.scala b/test-nsc/files/pos/bug123.scala
deleted file mode 100644
index 79f0c907a3..0000000000
--- a/test-nsc/files/pos/bug123.scala
+++ /dev/null
@@ -1,3 +0,0 @@
-class M{
-  val 1 = 1;
-}
diff --git a/test-nsc/files/pos/bug124.scala b/test-nsc/files/pos/bug124.scala
deleted file mode 100644
index 9aed6786f6..0000000000
--- a/test-nsc/files/pos/bug124.scala
+++ /dev/null
@@ -1,5 +0,0 @@
-class N{
-  val F: Any => Any  = (x:Any) => F(x);
-  val f:(Any => Any) = (x:Any) => f(x);
-  val g: Any => Any  = (x:Any) => g(x);
-}
diff --git a/test-nsc/files/pos/bug151.scala b/test-nsc/files/pos/bug151.scala
deleted file mode 100644
index 86667b49f7..0000000000
--- a/test-nsc/files/pos/bug151.scala
+++ /dev/null
@@ -1,6 +0,0 @@
-abstract class Foo {
-  type T;
-  def foo(a: T): Int = 0;
-  val foo: Foo = null;
-  def a: foo.T = a;
-}
diff --git a/test-nsc/files/pos/bug159.scala b/test-nsc/files/pos/bug159.scala
deleted file mode 100644
index ef6eba5255..0000000000
--- a/test-nsc/files/pos/bug159.scala
+++ /dev/null
@@ -1,22 +0,0 @@
-object foo {
-
-  // the problem seems to appear only
-  // if "val _" is in the body of a case
-  def cooked( ckd:StringBuffer ):Unit =
-    'a' match {
-      case '-' =>
-        val _ = ckd.append( '_' );
-      case 'v' =>
-        val _ = ckd.append( '_' );
-    }
-
-}
-object foo1 {
-  def f():Unit = {
-    1 match {
-      case 2 => val _ = 1;
-      case 3 => val _ = 2;
-      case 4 => val _ = 2;
-    }
-  }
-}
diff --git a/test-nsc/files/pos/bug160.scala b/test-nsc/files/pos/bug160.scala
deleted file mode 100644
index f1c36ebeae..0000000000
--- a/test-nsc/files/pos/bug160.scala
+++ /dev/null
@@ -1,5 +0,0 @@
-// $Id$
-
-class Foo(s:String) {
-  def this() = { this("DEFAULT") }
-}
diff --git a/test-nsc/files/pos/bug17.scala b/test-nsc/files/pos/bug17.scala
deleted file mode 100644
index a83eefe972..0000000000
--- a/test-nsc/files/pos/bug17.scala
+++ /dev/null
@@ -1,21 +0,0 @@
-class Quantity {
-    def getValue = 0;
-    def connect(c: Constraint) = c.newValue;
-}
-
-abstract class Constraint(q: Quantity) {
-    def newValue: Unit;
-    q connect this
-}
-
-class Adder(q: Quantity) extends Constraint(q) {
-    def newValue = System.out.println(q.getValue);
-}
-
-object Main {
-    def main(args: Array[String]): Unit = {
-        val x = new Quantity;
-        new Adder(x);
-        ()
-    }
-}
diff --git a/test-nsc/files/pos/bug175.scala b/test-nsc/files/pos/bug175.scala
deleted file mode 100644
index 2ef26589c2..0000000000
--- a/test-nsc/files/pos/bug175.scala
+++ /dev/null
@@ -1,5 +0,0 @@
-// $Id$
-
-abstract class C {
-  def this(x: Unit) = { this() }
-}
diff --git a/test-nsc/files/pos/bug177.scala b/test-nsc/files/pos/bug177.scala
deleted file mode 100644
index 9bd913f179..0000000000
--- a/test-nsc/files/pos/bug177.scala
+++ /dev/null
@@ -1,10 +0,0 @@
-// $Id$
-
-class A {
-  def foo = {
-    object Y {
-      def bar = 1;
-    }
-    Y.bar
-  }
-}
diff --git a/test-nsc/files/pos/bug183.scala b/test-nsc/files/pos/bug183.scala
deleted file mode 100644
index 4804eb3828..0000000000
--- a/test-nsc/files/pos/bug183.scala
+++ /dev/null
@@ -1,6 +0,0 @@
-// $Id$
-
-object Test {
-  new Foo(0);
-  class Foo(x: Int);
-}
diff --git a/test-nsc/files/pos/bug193.scala b/test-nsc/files/pos/bug193.scala
deleted file mode 100644
index 9b1c82f45f..0000000000
--- a/test-nsc/files/pos/bug193.scala
+++ /dev/null
@@ -1,74 +0,0 @@
-// $Id$
-
-trait Test {
-
-  def fun_00(x: Int): Unit = {
-    (0: Any) == 0;
-    (0     ) == 0;
-    (0: Any) != 0;
-    (0     ) != 0;
-    ()
-  }
-
-  def fun_i0(x: Int): Unit = {
-    (x: Any) == 0;
-    (x     ) == 0;
-    (x: Any) != 0;
-    (x     ) != 0;
-    ()
-  }
-
-  def fun_o0(x: Object): Unit = {
-    (x: Any) == 0;
-    (x     ) == 0;
-    (x: Any) != 0;
-    (x     ) != 0;
-    ()
-  }
-
-  def fun_0i(y: Int): Unit = {
-    (0: Any) == y;
-    (0     ) == y;
-    (0: Any) != y;
-    (0     ) != y;
-    ()
-  }
-
-  def fun_0o(y: Object): Unit = {
-     (0: Any) == y;
-     (0     ) == y;
-     (0: Any) != y;
-     (0     ) != y;
-    ()
-  }
-
-  def fun_ii(x: Int, y: Int): Unit = {
-    (x: Any) == y;
-    (x     ) == y;
-    (x: Any) != y;
-    (x     ) != y;
-    ()
-  }
-  def fun_io(x: Int, y: Object): Unit = {
-    (x: Any) == y;
-    (x     ) == y;
-    (x: Any) != y;
-    (x     ) != y;
-    ()
-  }
-  def fun_oi(x: Object, y: Int): Unit = {
-    (x: Any) == y;
-    (x     ) == y;
-    (x: Any) != y;
-    (x     ) != y;
-    ()
-  }
-  def fun_oo(x: Object, y: Object): Unit = {
-    (x: Any) == y;
-    (x     ) == y;
-    (x: Any) != y;
-    (x     ) != y;
-    ()
-  }
-
-}
diff --git a/test-nsc/files/pos/bug2.scala b/test-nsc/files/pos/bug2.scala
deleted file mode 100644
index 4c58ed3f4f..0000000000
--- a/test-nsc/files/pos/bug2.scala
+++ /dev/null
@@ -1,6 +0,0 @@
-object main {
-  def main(args: Array[String]) = {
-    val b = true;
-    while (b == true) { }
-  }
-}
diff --git a/test-nsc/files/pos/bug20.scala b/test-nsc/files/pos/bug20.scala
deleted file mode 100644
index bdf33ef20d..0000000000
--- a/test-nsc/files/pos/bug20.scala
+++ /dev/null
@@ -1,8 +0,0 @@
-object Exceptions {
-
-    class CubeException(s: String) extends java.lang.RuntimeException(s);
-
-    def main(args: Array[String]) =
-        System.out.println(new CubeException("test"));
-
-}
diff --git a/test-nsc/files/pos/bug201.scala b/test-nsc/files/pos/bug201.scala
deleted file mode 100644
index 53dac21ef0..0000000000
--- a/test-nsc/files/pos/bug201.scala
+++ /dev/null
@@ -1,7 +0,0 @@
-class C[a] { def f: a = f; }
-class D[b] { class E extends C[b]; }
-object Test {
-  val d = new D[int];
-  def e = new d.E;
-  e.f;
-}
diff --git a/test-nsc/files/pos/bug204.scala b/test-nsc/files/pos/bug204.scala
deleted file mode 100644
index 23d36523e9..0000000000
--- a/test-nsc/files/pos/bug204.scala
+++ /dev/null
@@ -1,7 +0,0 @@
-class A {
-  object B {
-    def f() = {
-      class C extends A {}; new C : A
-    }
-  }
-}
diff --git a/test-nsc/files/pos/bug210.scala b/test-nsc/files/pos/bug210.scala
deleted file mode 100644
index 20450335f4..0000000000
--- a/test-nsc/files/pos/bug210.scala
+++ /dev/null
@@ -1,17 +0,0 @@
-trait Lang1 {
-  trait Exp;
-  trait Visitor { def f(left: Exp): unit; }
-  class Eval1: Visitor extends Visitor {
-    def f(left: Exp) = ();
-  }
-}
-
-trait Lang2 extends Lang1 {
-  class Eval2: Visitor extends Eval1;
-}
-/*
-object Main with Application {
-  val lang2 = new Lang2 {};
-  val eval = new lang2.Eval2;
-}
-*/
diff --git a/test-nsc/files/pos/bug211.scala b/test-nsc/files/pos/bug211.scala
deleted file mode 100644
index 8c5cf1dc1e..0000000000
--- a/test-nsc/files/pos/bug211.scala
+++ /dev/null
@@ -1,8 +0,0 @@
-trait A;
-trait B;
-class Foo: (A with B) extends A with B;
-object Test extends Application {
-  new Foo();
-  System.out.println("bug211 completed");
-}
-
diff --git a/test-nsc/files/pos/bug229.scala b/test-nsc/files/pos/bug229.scala
deleted file mode 100644
index 2bceea0782..0000000000
--- a/test-nsc/files/pos/bug229.scala
+++ /dev/null
@@ -1,3 +0,0 @@
-class Test extends java.util.ArrayList {
-  override def add(index: int, element: java.lang.Object): unit = {}
-}
diff --git a/test-nsc/files/pos/bug245.scala b/test-nsc/files/pos/bug245.scala
deleted file mode 100644
index b33dd9914f..0000000000
--- a/test-nsc/files/pos/bug245.scala
+++ /dev/null
@@ -1,18 +0,0 @@
-class Value {}
-
-object Test {
-
-  implicit def view(v: Value): int = 0;
-
-  def foo(i: Int): Int = 0;
-
-  def fun0         : Value = null;
-  def fun0(i: Int ): Value = null;
-
-  def fun1(i: Int ): Value = null;
-  def fun1(l: Long): Value = null;
-
-  foo(fun0           );
-  foo(fun1(new Value));
-
-}
diff --git a/test-nsc/files/pos/bug267.scala b/test-nsc/files/pos/bug267.scala
deleted file mode 100644
index d99b1fa1fc..0000000000
--- a/test-nsc/files/pos/bug267.scala
+++ /dev/null
@@ -1,55 +0,0 @@
-package expAbstractData;
-
-/** A base class consisting of
- *   - a root trait (i.e. abstract class) `Exp' with an `eval' function
- *   - an abstract type `exp' bounded by `Exp'
- *   - a concrete instance class `Num' of `Exp' for numeric literals
- */
-trait Base {
-  type exp <: Exp;
-
-  trait Exp {
-    def eval: int
-  }
-  class Num(v: int): exp extends Exp {
-    val value = v;
-    def eval = value
-  }
-}
-
-object testBase extends Application with Base {
-  type exp = Exp;
-  val term = new Num(2);
-  System.out.println(term.eval);
-}
-
-/** Data extension: An extension of `Base' with `Plus' expressions
- */
-trait BasePlus extends Base {
-  class Plus(l: exp, r: exp): exp extends Exp {
-    val left = l;
-    val right = r;
-    def eval = left.eval + right.eval
-  }
-}
-
-/** Operation extension: An extension of `Base' with 'show' methods.
- */
-trait Show extends Base {
-  type exp <: Exp1;
-
-  trait Exp1 extends Exp {
-    def show: String;
-  }
-  class Num1(v: int): (exp with Num1) extends Num(v) with Exp1 {
-    def show = value.toString();
-  }
-}
-
-/** Operation extension: An extension of `BasePlus' with 'show' methods.
- */
-trait ShowPlus extends BasePlus with Show {
-  class Plus1(l: exp, r: exp): (exp with Plus1) extends Plus(l, r) with Exp1 {
-    def show = left.show + " + " + right.show
-  }
-}
diff --git a/test-nsc/files/pos/bug287.scala b/test-nsc/files/pos/bug287.scala
deleted file mode 100644
index 81a01951b2..0000000000
--- a/test-nsc/files/pos/bug287.scala
+++ /dev/null
@@ -1,12 +0,0 @@
-object testBuf {
-  class mystream extends java.io.BufferedOutputStream(new java.io.FileOutputStream("/dev/null")) {
-    def w( x:String ):Unit = {
-      val foo = new Array[byte](2);
-
-      // write( byte[] ) is defined in FilterOutputStream, the superclass of BufferedOutputStream
-      super.write( foo ); // error
-
-      super.write( foo, 0, foo.length ); // this works however
-    }
-  }
-}
diff --git a/test-nsc/files/pos/bug289.scala b/test-nsc/files/pos/bug289.scala
deleted file mode 100644
index 2fb91510d2..0000000000
--- a/test-nsc/files/pos/bug289.scala
+++ /dev/null
@@ -1,7 +0,0 @@
-// $Id$
-
-class A {
-  object B;
-}
-
-object C extends A;
diff --git a/test-nsc/files/pos/bug29.scala b/test-nsc/files/pos/bug29.scala
deleted file mode 100644
index 1b33c6cffd..0000000000
--- a/test-nsc/files/pos/bug29.scala
+++ /dev/null
@@ -1,3 +0,0 @@
-object Main {
-  def f[a]: List[List[a]] = for (val l1 <- Nil; val l2 <- Nil) yield l1;
-}
diff --git a/test-nsc/files/pos/bug295.scala b/test-nsc/files/pos/bug295.scala
deleted file mode 100644
index 22c7beff4d..0000000000
--- a/test-nsc/files/pos/bug295.scala
+++ /dev/null
@@ -1,2 +0,0 @@
-object Test extends java.rmi.server.UnicastRemoteObject {
-}
diff --git a/test-nsc/files/pos/bug30.scala b/test-nsc/files/pos/bug30.scala
deleted file mode 100644
index 6d28e18c0d..0000000000
--- a/test-nsc/files/pos/bug30.scala
+++ /dev/null
@@ -1,9 +0,0 @@
-trait A {
-  def f(x: int): unit;
-  def f(x: String): unit;
-}
-
-class B extends A {
-  def f(x: int): unit = ();
-  def f(x: String): unit = ();
-}
diff --git a/test-nsc/files/pos/bug304.scala b/test-nsc/files/pos/bug304.scala
deleted file mode 100644
index 76da44157d..0000000000
--- a/test-nsc/files/pos/bug304.scala
+++ /dev/null
@@ -1,5 +0,0 @@
-object O {
-  def f1 = -1;
-  def f2 = 0-1;
-  def f3 = -f1;
-}
diff --git a/test-nsc/files/pos/bug31.scala b/test-nsc/files/pos/bug31.scala
deleted file mode 100644
index 92f33bfd02..0000000000
--- a/test-nsc/files/pos/bug31.scala
+++ /dev/null
@@ -1,29 +0,0 @@
-object Main {
-
-    trait Ensure[a] {
-        def ensure(postcondition: a => Boolean): a
-    }
-
-    def require[a](precondition: => Boolean)(command: => a): Ensure[a] =
-        if (precondition)
-            new Ensure[a] {
-	        def ensure(postcondition: a => Boolean): a = {
-	            val result = command;
-	            if (postcondition(result)) result
-	            else error("Assertion error")
-                }
-	    }
-        else
-            error("Assertion error");
-
-    def arb[a](s: List[a]) =
-        require (! s.isEmpty) {
-           s.head
-        } ensure (result => s contains result);
-
-    def main(args: Array[String]) = {
-    	val s = List(1, 2);
-        System.out.println(arb(s))
-    }
-
-}
diff --git a/test-nsc/files/pos/bug318.scala b/test-nsc/files/pos/bug318.scala
deleted file mode 100644
index 1b9fa4a4b3..0000000000
--- a/test-nsc/files/pos/bug318.scala
+++ /dev/null
@@ -1,11 +0,0 @@
-// $Id$
-
-object Test {
-  def fun: Int = {
-    object o {
-      def a: Int = 1;
-      class C { def b: Int =  a; }
-    }
-    0
-  }
-}
diff --git a/test-nsc/files/pos/bug32.scala b/test-nsc/files/pos/bug32.scala
deleted file mode 100644
index 4354727d1a..0000000000
--- a/test-nsc/files/pos/bug32.scala
+++ /dev/null
@@ -1,17 +0,0 @@
-import java.io._;
-
-class PromptStream(s: OutputStream) extends PrintStream(s) {
-    override def println() = super.println();
-}
-
-object Main {
-
-    val out = new PromptStream(System.out);
-
-    System.setOut(out);
-
-    def main(args: Array[String]) =
-        //out.println("hello world");
-      ()
-
-}
diff --git a/test-nsc/files/pos/bug342.scala b/test-nsc/files/pos/bug342.scala
deleted file mode 100644
index 2e72ef220b..0000000000
--- a/test-nsc/files/pos/bug342.scala
+++ /dev/null
@@ -1,9 +0,0 @@
-object Main extends Application {
-
-//object Foo extends Enumeration {            // 1: OK !
-  object Foo extends Enumeration(0, "Bar") {  // 2
-    val Bar = Value
-  }
-  import Foo._;
-  Console.println(Bar)
-}
diff --git a/test-nsc/files/pos/bug348plus.scala b/test-nsc/files/pos/bug348plus.scala
deleted file mode 100644
index 30fa1576af..0000000000
--- a/test-nsc/files/pos/bug348plus.scala
+++ /dev/null
@@ -1,24 +0,0 @@
-// bug #348
-
-trait Foo {
-  type bar <: Bar;
-  abstract class Bar;
-  case class Baz(r:bar) extends Bar;
-  case object NoBar extends Bar;
-}
-object Test extends Application {
-  object ConcreteFooBar extends Foo { // if moved to toplevel, it works
-    type bar = Bar;
-  }
-  def foo = {
-    import ConcreteFooBar._ ;
-    Baz( NoBar )
-  }
-}
-
-// bug #367
-
-object Bla {
-  def foo(): Unit = (return null).equals(null);
-}
-
diff --git a/test-nsc/files/pos/bug359.scala b/test-nsc/files/pos/bug359.scala
deleted file mode 100644
index 6ce4640998..0000000000
--- a/test-nsc/files/pos/bug359.scala
+++ /dev/null
@@ -1,30 +0,0 @@
-// $Id$
-
-object Bug359 {
-  class C;
-  def f1(xs: List[C]): C = {
-    g {
-      xs =>
-        if (false) {
-          f1(xs)
-        } else {
-          val a: C = null;
-          val b: C = null;
-          if (xs.isEmpty) a else b
-        }
-    }
-  }
-  def f2(xs: List[C]): C = {
-    g {
-      xs =>
-        if (false) {
-          val a: C = null;
-          val b: C = null;
-          if (xs.isEmpty) a else b
-        } else {
-          f2(xs);
-        }
-    }
-  }
-  private def g(op: List[C] => C): C = null;
-}
diff --git a/test-nsc/files/pos/bug36.scala b/test-nsc/files/pos/bug36.scala
deleted file mode 100644
index 1d923b0017..0000000000
--- a/test-nsc/files/pos/bug36.scala
+++ /dev/null
@@ -1,8 +0,0 @@
-object m {
-
-  val xs: List[int] = Nil;
-  def f(i: int) = 0;
-  val v = xs map f;
-
-  def m() = {}
-}
diff --git a/test-nsc/files/pos/bug360.scala b/test-nsc/files/pos/bug360.scala
deleted file mode 100644
index 0fcb5cb161..0000000000
--- a/test-nsc/files/pos/bug360.scala
+++ /dev/null
@@ -1,11 +0,0 @@
-// $Id$
-
-abstract class Bug360A: Bug360C {
-  def f: String = "hello";
-}
-trait Bug360B: Bug360C {
-  object d {
-    System.out.println(f);
-  }
-}
-abstract class Bug360C extends Bug360A with Bug360B;
diff --git a/test-nsc/files/pos/bug361.scala b/test-nsc/files/pos/bug361.scala
deleted file mode 100644
index f48c906246..0000000000
--- a/test-nsc/files/pos/bug361.scala
+++ /dev/null
@@ -1,18 +0,0 @@
-// $Id$
-
-class Bug361Global extends Bug361Trees;
-
-abstract class Bug361Trees: Bug361Global {
-
-  abstract class Tree {
-    var pos: int = 0;
-  }
-
-  object posAssigner {
-    def atPos[T <: Tree](pos: int, tree: T): T = {
-      tree.pos = pos; tree
-    }
-  }
-
-  def atPos[T <: Tree](pos: int)(tree: T): T = posAssigner.atPos(pos, tree);
-}
diff --git a/test-nsc/files/pos/bug372.scala b/test-nsc/files/pos/bug372.scala
deleted file mode 100644
index d16585abbe..0000000000
--- a/test-nsc/files/pos/bug372.scala
+++ /dev/null
@@ -1,4 +0,0 @@
-// $Id$
-
-class Bug372Names;
-class Bug372Symbols: (Bug372Symbols with Bug372Names);
diff --git a/test-nsc/files/pos/bug39.scala b/test-nsc/files/pos/bug39.scala
deleted file mode 100644
index a131bc0450..0000000000
--- a/test-nsc/files/pos/bug39.scala
+++ /dev/null
@@ -1,6 +0,0 @@
-abstract class Extensible[A, This <: Extensible[A, This]](x: A, xs: This): This {
-	def mkObj(x: A, xs: This): This;
-}
-class Fixed[A](x: A, xs: Fixed[A]) extends Extensible[A, Fixed[A]](x, xs) {
-	def mkObj(x: A, xs: Fixed[A]) = new Fixed(x, xs);
-}
diff --git a/test-nsc/files/pos/bug49.scala b/test-nsc/files/pos/bug49.scala
deleted file mode 100644
index 913ce06e00..0000000000
--- a/test-nsc/files/pos/bug49.scala
+++ /dev/null
@@ -1,3 +0,0 @@
-class C1(x: Object) {};
-
-class C2 extends C1({ class A extends Object {}; (new A) : Object }) {};
diff --git a/test-nsc/files/pos/bug53.scala b/test-nsc/files/pos/bug53.scala
deleted file mode 100644
index 44763ef144..0000000000
--- a/test-nsc/files/pos/bug53.scala
+++ /dev/null
@@ -1,7 +0,0 @@
-object bug {
-  def foobar[c]: Int = {
-    class Foo { def foo: Bar = new Bar(); }
-    class Bar { def bar: c   = bar; }
-    0
-  }
-}
diff --git a/test-nsc/files/pos/bug54.scala b/test-nsc/files/pos/bug54.scala
deleted file mode 100644
index 3dc8e161fd..0000000000
--- a/test-nsc/files/pos/bug54.scala
+++ /dev/null
@@ -1,4 +0,0 @@
-class A {
-  case class B(x: C) extends A {}
-  class C {}
-}
diff --git a/test-nsc/files/pos/bug61.scala b/test-nsc/files/pos/bug61.scala
deleted file mode 100644
index dd3f94f30c..0000000000
--- a/test-nsc/files/pos/bug61.scala
+++ /dev/null
@@ -1,10 +0,0 @@
-object O {
-
-  class testClass ;
-
-  case class testA() extends testClass ; // works if you leave away "extends..."
-                                         // or if you write TestA
-  def ga( x:testClass ) = x match {
-	  case testA() => ()
-  }
-}
diff --git a/test-nsc/files/pos/bug64.scala b/test-nsc/files/pos/bug64.scala
deleted file mode 100644
index c2ce4bf6d0..0000000000
--- a/test-nsc/files/pos/bug64.scala
+++ /dev/null
@@ -1,6 +0,0 @@
-object B {
-  def main(Args:Array[String]) = {
-    val Pair(_,x) = Pair(1,2);
-    x + 1;
-  }
-}
diff --git a/test-nsc/files/pos/bug66.scala b/test-nsc/files/pos/bug66.scala
deleted file mode 100644
index 2153264e7a..0000000000
--- a/test-nsc/files/pos/bug66.scala
+++ /dev/null
@@ -1,7 +0,0 @@
-class GBTree[A, B] /*with Map[A, B, GBTree[A,B]]*/ {
-    abstract class Tree[A,B];
-    case class Node[A,B](key:A,value:B,smaller:Node[A,B],bigger:Node[A,B])
-	extends Tree[A,B];
-    case class Nil[A,B]() extends Tree[A,B];
-
-}
diff --git a/test-nsc/files/pos/bug68.scala b/test-nsc/files/pos/bug68.scala
deleted file mode 100644
index beb2c7c0ab..0000000000
--- a/test-nsc/files/pos/bug68.scala
+++ /dev/null
@@ -1,6 +0,0 @@
-class E {
-  def f() = {
-    val (_::l1) = List(1,2,3);
-    l1.tail;
-  }
-}
diff --git a/test-nsc/files/pos/bug69.scala b/test-nsc/files/pos/bug69.scala
deleted file mode 100644
index 113820613f..0000000000
--- a/test-nsc/files/pos/bug69.scala
+++ /dev/null
@@ -1,11 +0,0 @@
-object testCQ  {
-                            // why does this not work directly
-  case class Thing( name:String, contains:List[ Thing ]  );
-
-  /* ... but this one does?
-  abstract class T;
-  case class Thing2( name:String, contains:List[ T ]  ) extends T;
-  */
-
-}
-
diff --git a/test-nsc/files/pos/bug76.scala b/test-nsc/files/pos/bug76.scala
deleted file mode 100644
index 5419cf5154..0000000000
--- a/test-nsc/files/pos/bug76.scala
+++ /dev/null
@@ -1,9 +0,0 @@
-// This is extracted from a test file => don't add a new test file.
-object bug {
-  def foo(i: => Int): Int = 0;
-
-  def bar: Int = {
-    var i: Int = 0;
-    foo (i);
-  }
-}
diff --git a/test-nsc/files/pos/bug81.scala b/test-nsc/files/pos/bug81.scala
deleted file mode 100644
index 20fd604974..0000000000
--- a/test-nsc/files/pos/bug81.scala
+++ /dev/null
@@ -1,4 +0,0 @@
-class A {
-    val b: A#B = new B;
-    class B {}
-}
diff --git a/test-nsc/files/pos/bug85.scala b/test-nsc/files/pos/bug85.scala
deleted file mode 100644
index e018afb6ee..0000000000
--- a/test-nsc/files/pos/bug85.scala
+++ /dev/null
@@ -1,8 +0,0 @@
-object A {
-  case class B(c: C) {
-    class C;
-  }
-  class C;
-  val b: B = new B(new C());
-  val c: C = b.c;
-}
diff --git a/test-nsc/files/pos/bug91.scala b/test-nsc/files/pos/bug91.scala
deleted file mode 100644
index 54c821b41c..0000000000
--- a/test-nsc/files/pos/bug91.scala
+++ /dev/null
@@ -1,6 +0,0 @@
-class Bug {
-  def main(args: Array[String]) = {
-    var msg: String = null; // no bug if "null" instead of "_"
-    val f:  PartialFunction[Any, unit] = { case 42 => msg = "coucou" };
-  }
-}
diff --git a/test-nsc/files/pos/bug93.scala b/test-nsc/files/pos/bug93.scala
deleted file mode 100644
index d648d773b0..0000000000
--- a/test-nsc/files/pos/bug93.scala
+++ /dev/null
@@ -1,4 +0,0 @@
-object Bug {
-  def f(cond: => Boolean) = while (cond == false) {};
-  // no bug with "false == cond"
-}
diff --git a/test-nsc/files/pos/cls.scala b/test-nsc/files/pos/cls.scala
deleted file mode 100644
index 54104ae692..0000000000
--- a/test-nsc/files/pos/cls.scala
+++ /dev/null
@@ -1,17 +0,0 @@
-import scala._;
-
-package scalac.util {
-
-class A[X1, X2](x1: X1, x2: X2) {}
-class B[Y](y1: Y, y2: Y) extends A[Y, Y](y1, y2) {
-  def f(x: Y, xs: B[Y]): Unit = {}
-  def g() = f(y1, this);
-}
-
-object test {
-  val b: B[Int] = new B[Int](1, 2);
-  val a: A[Int, Int] = b;
-  val a1 = new A(1, "hello");
-  val b1 = new B(1, "hello");
-}
-}
\ No newline at end of file
diff --git a/test-nsc/files/pos/cls1.scala b/test-nsc/files/pos/cls1.scala
deleted file mode 100644
index 20ac12d59a..0000000000
--- a/test-nsc/files/pos/cls1.scala
+++ /dev/null
@@ -1,9 +0,0 @@
-package test;
-
-trait A {
-  type T;
-
-  trait B extends A {
-    type T = A.this.T;
-  }
-}
diff --git a/test-nsc/files/pos/clsrefine.scala b/test-nsc/files/pos/clsrefine.scala
deleted file mode 100644
index d63923b5e6..0000000000
--- a/test-nsc/files/pos/clsrefine.scala
+++ /dev/null
@@ -1,40 +0,0 @@
-import scala._;
-
-package scalac.util {
-
-trait A {
-  type X1;
-  type X2;
-  val x1: X1;
-  val x2: X2;
-}
-trait B extends A {
-  type Y;
-  val y1, y2: Y;
-  type X1 = Y;
-  type X2 = Y;
-  val x1 = y1;
-  val x2 = y2;
-  def f(x: Y, xs: B): Unit = {}
-  def g() = f(y1, this);
-}
-
-object test {
-  val b: B { type Y = Int } = new B {
-    type Y = Int;
-    val y1, y2 = 1;
-  }
-  val a: A { type X1 = Int; type X2 = Int } = b;
-  val a1 = new A {
-    type X1 = Int;
-    type X2 = String;
-    val x1 = 1;
-    val x2 = "hello"
-  }
-  val b1 = new B {
-    type Y = Any;
-    val y1 = 1;
-    val y2 = "hello";
-  }
-}
-}
\ No newline at end of file
diff --git a/test-nsc/files/pos/code.scala b/test-nsc/files/pos/code.scala
deleted file mode 100644
index 05c6e4a779..0000000000
--- a/test-nsc/files/pos/code.scala
+++ /dev/null
@@ -1,3 +0,0 @@
-class Test {
-  val fun: reflect.TypedCode[int => int] = x => x + 1;
-}
diff --git a/test-nsc/files/pos/collections.scala b/test-nsc/files/pos/collections.scala
deleted file mode 100644
index 4f45a42786..0000000000
--- a/test-nsc/files/pos/collections.scala
+++ /dev/null
@@ -1,15 +0,0 @@
-package mixins;
-
-import scala.collection.mutable._;
-
-class Collections extends HashSet[Int] with ObservableSet[Int,Collections] {
-  override def +=(elem: Int): Unit = super.+=(elem);
-  override def -=(elem: Int): Unit = super.-=(elem);
-  override def clear: Unit = super.clear;
-
-}
-
-object collections extends Collections;
-
-//class Collections1 extends HashSet[Int] with ObservableSet[Int,Collections1];
-//object collections1 extends Collections1;
diff --git a/test-nsc/files/pos/compile.scala b/test-nsc/files/pos/compile.scala
deleted file mode 100644
index 3ed733fd40..0000000000
--- a/test-nsc/files/pos/compile.scala
+++ /dev/null
@@ -1,150 +0,0 @@
-//############################################################################
-// Compile Time Bugs & Test Cases
-//############################################################################
-// $Id$
-
-import java.lang.System; // to avoid name clash with .NET's library
-
-//############################################################################
-// Test 0
-
-/*
-class Test0Foo[X];
-
-object Test0Test {
-  type Gen[A] = Test0Foo[A];
-  class Tic(g: Test0Test.Gen[Int]);
-  class Tac(g:           Gen[Int]);
-}
-
-//############################################################################
-// Test 1 - Single types in lambda lift
-
-object Test1 {
-  def main(args: Array[String]): Unit = {
-    List[args.type](args);
-  }
-  def foo[X]: Any = {
-    def bar(x: X) = List(x);
-    0
-  }
-}
-
-//############################################################################
-// Test 2 - Local variables owned by other local variables
-
-class Test2_1(i: Int) {
-  val t = {
-    val x = {
-      val y = {
-        val z = i;
-        z;
-      };
-    };
-  };
-  val x = {
-    val y = {
-      val z = i;
-      z;
-    };
-  };
-  val y = {
-    val z = i;
-    z;
-  };
-  val z2_1 = i;
-}
-
-class Test2_2(i: Int) {
-  {
-    val t = {
-      val x = {
-        val y = {
-          val z = i;
-          z;
-        };
-      };
-    };
-    val x = {
-      val y = {
-        val z = i;
-        z;
-      };
-    };
-    val y = {
-      val z = i;
-      z;
-    };
-    val z2_2 = i;
-    0
-  }
-}
-
-class Test2_3() {
-
-  def this(i: Int) = {
-    this();
-    val t = {
-      val x = {
-        val y = {
-          val z = i;
-          z;
-        };
-      };
-    };
-    val x = {
-      val y = {
-        val z = i;
-        z;
-      };
-    };
-    val y = {
-      val z = i;
-      z;
-    };
-    val z2_3 = i;
-  }
-
-  def test(i: Int): Int = {
-    val t = {
-      val x = {
-        val y = {
-          val z = i;
-          z;
-        };
-      };
-    };
-    val x = {
-      val y = {
-        val z = i;
-        z;
-      };
-    };
-    val y = {
-      val z = i;
-      z;
-    };
-    val z_test = i;
-    0
-  }
-
-}
-*/
-//############################################################################
-// Test 3 - Super Calls with Mixins
-
-class Test3Foo;
-
-trait Test3A[T] {
-  def fun: T = fun;
-}
-
-class Test3B extends Test3A[Test3Foo];
-
-trait Test3M extends Test3A[Test3Foo] {
-  override def fun: Test3Foo = super.fun;
-}
-
-class Test3C extends Test3B with Test3M;
-
-//############################################################################
diff --git a/test-nsc/files/pos/compile1.scala b/test-nsc/files/pos/compile1.scala
deleted file mode 100644
index 3f06abbaa9..0000000000
--- a/test-nsc/files/pos/compile1.scala
+++ /dev/null
@@ -1,35 +0,0 @@
-//############################################################################
-// Compile Time Bugs & Test Cases
-//############################################################################
-// $Id$
-
-import java.lang.System; // to avoid name clash with .NET's library
-
-//############################################################################
-// Test 0
-
-class Test2_2(i: Int) {
-  {
-    val t = {
-      val x = {
-        val y = {
-          val z = i;
-          z;
-        };
-      };
-    };
-    val x = {
-      val y = {
-        val z = i;
-        z;
-      };
-    };
-    val y = {
-      val z = i;
-      z;
-    };
-    val z2_2 = i;
-    0
-  }
-}
-
diff --git a/test-nsc/files/pos/compound.scala b/test-nsc/files/pos/compound.scala
deleted file mode 100644
index 60890f9102..0000000000
--- a/test-nsc/files/pos/compound.scala
+++ /dev/null
@@ -1,9 +0,0 @@
-abstract class A { type T }
-
-abstract class B { val xz: Any }
-
-abstract class Test {
-  var yy: A with B { type T; val xz: T } = null;
-  var xx: A with B { type T; val xz: T } = null;
-  xx = yy;
-}
diff --git a/test-nsc/files/pos/constfold.scala b/test-nsc/files/pos/constfold.scala
deleted file mode 100644
index 2eb31b4086..0000000000
--- a/test-nsc/files/pos/constfold.scala
+++ /dev/null
@@ -1,14 +0,0 @@
-object A {
-  val x = 2;
-  val y = x.asInstanceOf[byte];
-  val z = 1.0 / 2;
-  val s = "z is " + z;
-}
-
-object Test extends Application {
-
-    System.out.println(A.x);
-    System.out.println(A.y);
-    System.out.println(A.z);
-    System.out.println(A.s);
-}
diff --git a/test-nsc/files/pos/context.scala b/test-nsc/files/pos/context.scala
deleted file mode 100644
index ada6a57463..0000000000
--- a/test-nsc/files/pos/context.scala
+++ /dev/null
@@ -1,34 +0,0 @@
-class Context {
-  object symwrap extends SymbolWrapper {
-    val context: Context.this.type = Context.this
-  }
-  object typewrap extends TypeWrapper {
-    val context: Context.this.type = Context.this
-  }
-  object symbols extends symwrap.Symbols;
-  object types extends typewrap.Types;
-}
-
-abstract class SymbolWrapper {
-  val context: Context;
-  import context._;
-
-  class Symbols: context.symbols.type {
-    abstract class Symbol {
-      def typ: types.Type;
-      def sym: Symbol = typ.sym;
-    }
-  }
-}
-
-abstract class TypeWrapper {
-  val context: Context;
-  import context._;
-
-  class Types: context.types.type {
-    abstract class Type {
-      def sym: symbols.Symbol;
-      def typ: Type = sym.typ;
-    }
-  }
-}
diff --git a/test-nsc/files/pos/eta.scala b/test-nsc/files/pos/eta.scala
deleted file mode 100644
index 7d862f67b1..0000000000
--- a/test-nsc/files/pos/eta.scala
+++ /dev/null
@@ -1,5 +0,0 @@
-object test {
-
-def sum(f: Int => Int)(x: Int, y: Int): Int = 0;
-def g = sum;
-}
\ No newline at end of file
diff --git a/test-nsc/files/pos/exceptions.scala b/test-nsc/files/pos/exceptions.scala
deleted file mode 100644
index 819368244d..0000000000
--- a/test-nsc/files/pos/exceptions.scala
+++ /dev/null
@@ -1,20 +0,0 @@
-import java.io._;
-
-object Test {
-
-  //def error[a](x: String):a = new java.lang.RuntimeException(x) throw;
-
-  def main(args: Array[String]): Unit = {
-    try {
-      try {
-	System.out.println("hi!");
-        error("xx");
-      } finally {
-        System.out.println("ho!")
-      }
-    } catch {
-      case ex: IOException => System.out.println("io exception!");
-      case ex => System.out.println(ex);
-    }
-  }
-}
diff --git a/test-nsc/files/pos/expressions-current.scala b/test-nsc/files/pos/expressions-current.scala
deleted file mode 100644
index b343dbf68b..0000000000
--- a/test-nsc/files/pos/expressions-current.scala
+++ /dev/null
@@ -1,63 +0,0 @@
-package test;
-
-abstract class Lang {
-  trait Visitor {
-    def caseNum(n: int): unit;
-  }
-
-  abstract class Exp {
-    def visit(v: visitor): unit;
-  }
-
-  type visitor <: Visitor;
-
-  class Num(n: int) extends Exp {
-    def visit(v: visitor): unit = v.caseNum(n);
-  }
-
-  class Eval(result: Ref[int]): visitor extends Visitor {
-    def caseNum(n: int) = result.elem = n;
-  }
-}
-
-abstract class Lang2 extends Lang {
-  trait Visitor2 extends Visitor {
-    def casePlus(left: Exp, right: Exp): unit;
-  }
-
-  type visitor <: Visitor2;
-
-  class Plus(l: Exp, r: Exp) extends Exp {
-    def visit(v: visitor): unit = v.casePlus(l, r);
-  }
-
-  class Eval2(result: Ref[int]): visitor extends Eval(result) with Visitor2 {
-    def casePlus(l: Exp, r: Exp) =
-      result.elem = { l.visit(this); result.elem } + { r.visit(this); result.elem }
-  }
-
-  class Show2(result: Ref[String]): visitor extends Visitor2 {
-    def caseNum(n: int) = result.elem = n.toString();
-    def casePlus(l: Exp, r: Exp) =
-	result.elem =
-	    "(" + { l.visit(this); result.elem } +
-            "+" + { r.visit(this); result.elem }+ ")";
-  }
-}
-
-object Main {
-
-  def main(args: Array[String]) = {
-    object l1 extends Lang { type visitor = Visitor }
-    val e1: l1.Exp = new l1.Num(42);
-
-    val iref = new Ref(0);
-    System.out.println("eval: " + { e1.visit(new l1.Eval(iref)); iref.elem });
-
-    object l2 extends Lang2 { type visitor = Visitor2 }
-    val e2: l2.Exp = new l2.Plus(new l2.Num(5), new l2.Num(37));
-    val sref = new Ref("");
-    System.out.println("eval: " + { e2.visit(new l2.Eval2(iref)); iref.elem });
-    System.out.println("show: " + { e2.visit(new l2.Show2(sref)); sref.elem });
-  }
-}
diff --git a/test-nsc/files/pos/failed.lst b/test-nsc/files/pos/failed.lst
deleted file mode 100644
index b5b75eb35c..0000000000
--- a/test-nsc/files/pos/failed.lst
+++ /dev/null
@@ -1,3 +0,0 @@
-bug123.scala
-exceptions.scala
-context.scala
diff --git a/test-nsc/files/pos/gui.scala b/test-nsc/files/pos/gui.scala
deleted file mode 100644
index b40759fb01..0000000000
--- a/test-nsc/files/pos/gui.scala
+++ /dev/null
@@ -1,99 +0,0 @@
-object Geom {
-  trait Shape;
-  case class Point(x: int, y: int) extends Shape;
-  case class Rectangle(ll: Point, ur: Point) extends Shape {
-    def inset(delta: int) =
-      Rectangle(Point(ll.x - delta, ll.y - delta), Point(ur.x + delta, ur.y + delta));
-  }
-}
-
-object Color {
-  type Color = int;
-  val black = 0x000000;
-  val grey  = 0x808080;
-}
-
-trait Screen {
-  type Color = int;
-  def drawRect(r: Geom.Rectangle, c: Color): unit;
-  def fillRect(r: Geom.Rectangle, c: Color): unit;
-}
-
-object DummyScreen extends Screen {
-  def drawRect(r: Geom.Rectangle, c: Color): unit =
-    System.out.println("draw " + r + " with " + c);
-  def fillRect(r: Geom.Rectangle, c: Color): unit =
-    System.out.println("fill " + r + " with " + c);
-}
-
-object GUI {
-
-  object Controller {
-    def addMouseCtl(c: MouseCtl) = ()
-  }
-
-  trait Glyph {
-    def getRect: Geom.Rectangle;
-    def setLoc(p: Geom.Point): unit;
-    def draw() = System.out.println("draw " + this);
-  }
-
-  class Label(scr: Screen, p: Geom.Point, name: String) extends Glyph {
-    private var origin = p;
-    def getRect = Geom.Rectangle(origin, origin).inset(10);
-    def setLoc(p: Geom.Point) = { origin = p }
-  }
-
-  trait Ctl {
-    def getGlyph: Glyph;
-    def enable(b: Boolean): this.type;
-  }
-
-  trait MouseCtl extends Ctl {
-    def mouseDown(p: Geom.Point): unit;
-  }
-
-  abstract class Button(scr: Screen, p: Geom.Point, name: String)
-  extends Glyph with MouseCtl {
-    var enabled: boolean = false;
-    val label = new Label(scr, p, name);
-
-    /* Glyph methods */
-    override def draw(): unit = {
-      if (enabled) scr.drawRect(getRect, Color.black)
-      else scr.fillRect(getRect, Color.grey);
-      label.draw();
-    }
-    def setLoc(p: Geom.Point) = label.setLoc(p);
-    def getRect = label.getRect.inset(-2);
-
-    /* Ctl methods */
-    def enable(b: boolean): this.type = { enabled = b; draw(); this }
-    def getGlyph = label;
-    final def mouseDown(p: Geom.Point): unit =
-      if (enabled) doit() else System.out.println("button is disabled");
-
-    /* deferred method to be specified by client */
-    def doit(): unit;
-  }
-}
-
-object GUIClient {
-
-  class Application {
-    def quit() = System.out.println("application exited");
-  }
-
-  class QuitButton (scr: Screen, p: Geom.Point, name: String, a: Application)
-  extends GUI.Button(scr, p, name) {
-    def doit(): unit = a.quit();
-  }
-
-  def main(args: Array[String]) = {
-    val b = new QuitButton(
-      DummyScreen, Geom.Point(1, 1), "quit", new Application);
-    b.draw();
-    b.enable(true).mouseDown(Geom.Point(1, 2));
-  }
-}
-
diff --git a/test-nsc/files/pos/imports.scala b/test-nsc/files/pos/imports.scala
deleted file mode 100644
index 65ea090436..0000000000
--- a/test-nsc/files/pos/imports.scala
+++ /dev/null
@@ -1,16 +0,0 @@
-package test;
-
-import java.lang.{System => S}
-
-object test {
-  import S.out.{print => p, println => print}
-
-  val foo = 1;
-
-  p("hello"); print("world"); S.out.println("!");
-  S.out.flush();
-}
-object test1 {
-  import test._;
-  foo
-}
\ No newline at end of file
diff --git a/test-nsc/files/pos/infer.scala b/test-nsc/files/pos/infer.scala
deleted file mode 100644
index 24871458b3..0000000000
--- a/test-nsc/files/pos/infer.scala
+++ /dev/null
@@ -1,11 +0,0 @@
-object test {
-  class List[+a] {
-    def ::[b >: a](x: b): List[b] = new Cons(x, this);
-  }
-  case class Cons[a, b <: a](x: a, xs: List[b]) extends List[a];
-  case object Nil extends List[All];
-  def nil[n]: List[n] = Nil;
-  def cons[a](x: a, xs: List[a]): List[a] = null;
-  val x: List[Int] = Nil.::(1);
-  val y: List[Int] = nil.::(1);
-}
diff --git a/test-nsc/files/pos/infer2.scala b/test-nsc/files/pos/infer2.scala
deleted file mode 100644
index 66f3d76544..0000000000
--- a/test-nsc/files/pos/infer2.scala
+++ /dev/null
@@ -1,10 +0,0 @@
-object test {
-
-  def f[a, b <: a](x: b): a = x: a;
-  def g[a >: b, b](x: b): a = x: a;
-
-  val x: int = f(1);
-  val y: String = g("")
-
-}
-
diff --git a/test-nsc/files/pos/lambda.scala b/test-nsc/files/pos/lambda.scala
deleted file mode 100644
index 187b3f9783..0000000000
--- a/test-nsc/files/pos/lambda.scala
+++ /dev/null
@@ -1,8 +0,0 @@
-object test {
-
-  def apply[a,b](f: a => b): a => b  =  x: a => f(x);
-
-  def twice[a](f: a => a): a => a  =  x: a => f(f(x));
-
-  def main = apply[Int,Int](twice[Int](x: Int => x))(1);
-}
\ No newline at end of file
diff --git a/test-nsc/files/pos/lambdalift.scala b/test-nsc/files/pos/lambdalift.scala
deleted file mode 100644
index ae5799a6f8..0000000000
--- a/test-nsc/files/pos/lambdalift.scala
+++ /dev/null
@@ -1,15 +0,0 @@
-import scala._;
-
-object test {
-
-  def f(x: Int) = {
-    def g() = h();
-    def h() = x;
-    g();
-    class inner() {
-      def g() = h();
-      def h() = x;
-    }
-    g() + new inner().g();
-  }
-}
\ No newline at end of file
diff --git a/test-nsc/files/pos/lambdalift1.scala b/test-nsc/files/pos/lambdalift1.scala
deleted file mode 100644
index d9172f51eb..0000000000
--- a/test-nsc/files/pos/lambdalift1.scala
+++ /dev/null
@@ -1,17 +0,0 @@
-import scala._;
-
-object test {
-
-  def f[a <: java.lang.Object](x: a) = {
-    def print() = java.lang.System.out.println(x);
-    class A() {
-      def g() = {
-	class B() {
-	  def h() = print()
-	}
-	new B().h()
-      }
-    }
-    new A().g()
-  }
-}
\ No newline at end of file
diff --git a/test-nsc/files/pos/localmodules.scala b/test-nsc/files/pos/localmodules.scala
deleted file mode 100644
index 8ed34f455a..0000000000
--- a/test-nsc/files/pos/localmodules.scala
+++ /dev/null
@@ -1,22 +0,0 @@
-package test;
-
-object main {
-
-  class a {
-
-    object b {
-
-      trait c {}
-      def foo(x: c): c = { System.out.println("foo(" + x + ")"); x }
-
-    }
-
-    def bar(x: b.c): a.this.b.c = { b.foo(x); x }
-  }
-
-  def main(args: Array[String]) = {
-    val aa = new a;
-    val xx: aa.b.c = null;
-    System.out.println(aa.bar(xx));
-  }
-}
diff --git a/test-nsc/files/pos/matthias1.scala b/test-nsc/files/pos/matthias1.scala
deleted file mode 100644
index a923a529fe..0000000000
--- a/test-nsc/files/pos/matthias1.scala
+++ /dev/null
@@ -1,15 +0,0 @@
-class A() {
-     class B() {
-         def foo(x: B) = 0
-     }
-}
-object test {
-  def main = {
-    val a = new A();
-    val b = new a.B();
-    val c = new a.B();
-    val d = b.foo(c);
-    ()
-  }
-}
-
diff --git a/test-nsc/files/pos/matthias3.scala b/test-nsc/files/pos/matthias3.scala
deleted file mode 100644
index 6e86afeca6..0000000000
--- a/test-nsc/files/pos/matthias3.scala
+++ /dev/null
@@ -1,13 +0,0 @@
-
-abstract class A() {
-    val y: A;
-}
-class B() extends A() {
-    val x = this;
-    val y: x.type = x;
-}
-abstract class C() {
-    val b: B = new B();
-    val a: A { val y: b.type };
-}
-
diff --git a/test-nsc/files/pos/matthias4.scala b/test-nsc/files/pos/matthias4.scala
deleted file mode 100644
index c6ce79d682..0000000000
--- a/test-nsc/files/pos/matthias4.scala
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
-object A requires B {
-    B.X getX() {
-        return B.getX();
-    }
-    void setX(B.X x) {}
-}
-object B {
-    class X {}
-    X getX() {
-        return new X();
-    }
-    void setX(X x) {}
-}
-object C requires B {
-    object A;
-    void test() {
-        A.setX(B.getX());
-    }
-}
-*/
-
-trait _a extends Object with _b {
-    val a: _a;
-    val A: A;
-    type A <: a.AObject;
-    trait AObject {
-        def getX(): B.X;
-        def setX(x: B.X): Unit;
-    }
-}
-trait a123 extends Object with _a with _b {
-    val a: this.type = this;
-    val A: A = new A();
-    class A() extends AObject {
-        def getX(): B.X = B.getX();
-        def setX(x: B.X) = B.setX(x);
-    }
-}
-
-trait _b {
-    val b: _b;
-    val B: B;
-    type B <: b.BObject;
-    trait BObject {
-        type X;
-        def getX(): X;
-        def setX(x: X): Unit;
-    }
-}
-abstract class b() extends Object with _b {
-    val b: this.type = this;
-    val B: B = new B();
-    class B() extends BObject {
-        class X() {}
-        def getX(): X = new X();
-        def setX(x: X) = ();
-    }
-}
-
-trait _m {
-    val m: _m;
-    val M: M;
-    type M <: m.MObject;
-    trait MObject {}
-}
-abstract class m() extends Object with _m with _b {
-    val m: this.type = this;
-    val M: M = new M();
-    class M() extends MObject with a123 with Linker {
-        def test() = {
-            val x: B.X = B.getX();
-            A.setX(x);
-        }
-    }
-    trait Linker {
-        val b: m.this.b.type = m.this.b;
-        val B: m.this.B.type = m.this.B;
-        type B = m.this.B;
-        val m: m.this.m.type = m.this.m;
-        val M: m.this.M.type = m.this.M;
-        type M = m.this.M;
-    }
-}
diff --git a/test-nsc/files/pos/matthias5.scala b/test-nsc/files/pos/matthias5.scala
deleted file mode 100644
index 0dcb7f833d..0000000000
--- a/test-nsc/files/pos/matthias5.scala
+++ /dev/null
@@ -1,12 +0,0 @@
-abstract class A() {
-    val y: A;
-}
-class B() extends A() {
-    val x = this;
-    val y: x.type = x;
-}
-abstract class C() {
-    val b: B = new B();
-    val a: A { val y: b.type };
-}
-
diff --git a/test-nsc/files/pos/maxim1.scala b/test-nsc/files/pos/maxim1.scala
deleted file mode 100644
index 58916beb8a..0000000000
--- a/test-nsc/files/pos/maxim1.scala
+++ /dev/null
@@ -1,5 +0,0 @@
-object test {
-  def f(x: Int)(y: Int) = x + y;
-  def y: Int => Int = f(2);
-  def main = y(1);
-}
diff --git a/test-nsc/files/pos/michel1.scala b/test-nsc/files/pos/michel1.scala
deleted file mode 100644
index f930a682ef..0000000000
--- a/test-nsc/files/pos/michel1.scala
+++ /dev/null
@@ -1,9 +0,0 @@
-class A[Ta] (a : Ta) {
-  def f = 1
-}
-
-trait C {}
-
-class B[Tb] (b : Tb) extends A[Tb] (b) with C {
-  def g = 2
-}
diff --git a/test-nsc/files/pos/michel2.scala b/test-nsc/files/pos/michel2.scala
deleted file mode 100644
index e6976b0f40..0000000000
--- a/test-nsc/files/pos/michel2.scala
+++ /dev/null
@@ -1,16 +0,0 @@
-object Test {
-
-  trait A extends Object {
-    def f : Int = 1
-  }
-
-  class B extends Object with A {
-    override def f : Int = super[A].f
-  }
-
-  def main(args: Array[String]) =
-    System.out.println(new B().f);
-}
-
-
-
diff --git a/test-nsc/files/pos/michel3.scala b/test-nsc/files/pos/michel3.scala
deleted file mode 100644
index 0e85295bfb..0000000000
--- a/test-nsc/files/pos/michel3.scala
+++ /dev/null
@@ -1,3 +0,0 @@
-abstract class A() {
-  val v : Int
-}
\ No newline at end of file
diff --git a/test-nsc/files/pos/michel4.scala b/test-nsc/files/pos/michel4.scala
deleted file mode 100644
index 2390be5d26..0000000000
--- a/test-nsc/files/pos/michel4.scala
+++ /dev/null
@@ -1,7 +0,0 @@
-class A() {
-  val f : Int = 2
-}
-
-class B() extends A() {
-  override val f : Int = super.f
-}
\ No newline at end of file
diff --git a/test-nsc/files/pos/michel5.scala b/test-nsc/files/pos/michel5.scala
deleted file mode 100644
index 345ae04d9d..0000000000
--- a/test-nsc/files/pos/michel5.scala
+++ /dev/null
@@ -1,5 +0,0 @@
-trait A[Ta] { }
-
-class B() extends Object with A[Int] {
-  val x : Int = 2
-}
\ No newline at end of file
diff --git a/test-nsc/files/pos/michel6.scala b/test-nsc/files/pos/michel6.scala
deleted file mode 100644
index b32e8bed75..0000000000
--- a/test-nsc/files/pos/michel6.scala
+++ /dev/null
@@ -1,6 +0,0 @@
-object M {
-   def f(x: Int): Unit = {}
-
-   def g(): Int => Unit =
-     if (0 == 0) f else g()
- }
diff --git a/test-nsc/files/pos/mixins.scala b/test-nsc/files/pos/mixins.scala
deleted file mode 100644
index 2b403a25e8..0000000000
--- a/test-nsc/files/pos/mixins.scala
+++ /dev/null
@@ -1,22 +0,0 @@
-package mixins;
-abstract class Super {
-  def foo: int;
-}
-trait Mixin extends Super {
-  abstract override def foo = super.foo;
-}
-trait MixinSub extends Super with Mixin {
-  abstract override def foo: int = super.foo;
-}
-trait MixinSubSub extends MixinSub {
-  abstract override def foo = super.foo;
-}
-class Sub extends Super {
-  def foo: int = 1
-}
-class Base extends Sub with MixinSubSub {
-  override def foo = super.foo;
-}
-trait Mixin1 extends Sub with MixinSubSub {}
-class Base1 extends Mixin1 {}
-
diff --git a/test-nsc/files/pos/modules.scala b/test-nsc/files/pos/modules.scala
deleted file mode 100644
index 8168a42d3c..0000000000
--- a/test-nsc/files/pos/modules.scala
+++ /dev/null
@@ -1,14 +0,0 @@
-package scala {
-
-  object a {
-
-    object b {
-
-      trait c {}
-      def foo(x: c): c = bar(x)
-
-    }
-
-    def bar(x: b.c): b.c = x
-  }
-}
diff --git a/test-nsc/files/pos/modules1.scala b/test-nsc/files/pos/modules1.scala
deleted file mode 100644
index 3da14af4fe..0000000000
--- a/test-nsc/files/pos/modules1.scala
+++ /dev/null
@@ -1,14 +0,0 @@
-package scala {
-
-  object a {
-
-    object b {
-
-      trait c {}
-      def foo(x: c): c = bar(x)
-
-    }
-
-    def bar(x: b.c): a.b.c = { b.foo(x); x }
-  }
-}
diff --git a/test-nsc/files/pos/moduletrans.scala b/test-nsc/files/pos/moduletrans.scala
deleted file mode 100644
index 51538417ed..0000000000
--- a/test-nsc/files/pos/moduletrans.scala
+++ /dev/null
@@ -1,8 +0,0 @@
-object m1 {
-
-  class m() {
-    def f() = 5
-  }
-  final val m: m = new m()
-
-}
diff --git a/test-nsc/files/pos/nested.scala b/test-nsc/files/pos/nested.scala
deleted file mode 100644
index b038fce39d..0000000000
--- a/test-nsc/files/pos/nested.scala
+++ /dev/null
@@ -1,29 +0,0 @@
-// A non-trivial example of nested classes (mostly to test
-// ExplicitOuterClasses).
-
-class A(pa : Int) {
-  def a1 = pa;
-  class B(pb : Int) {
-    def b1 = pa+pb+a1;
-    class C(pc : Int) extends A(b1) {
-      def c1 = pc+pb+pa
-    }
-    val c1 = new C(66)
-  }
-}
-
-trait M {
-  val x : Int;
-  def m1 = x
-}
-
-class A1(x0 : Int) extends A(x0) with M {
-  val x = x0;
-  class D() extends B(42) {
-    val c2 = new C(66);
-    class E() extends C(5) {
-      def e1 = c1+b1+a1;
-      def e2 = new D();
-    }
-  }
-}
diff --git a/test-nsc/files/pos/null.scala b/test-nsc/files/pos/null.scala
deleted file mode 100644
index 59f88ee0e0..0000000000
--- a/test-nsc/files/pos/null.scala
+++ /dev/null
@@ -1,3 +0,0 @@
-object M {
-  val x: Boolean = null == null;
-}
\ No newline at end of file
diff --git a/test-nsc/files/pos/ok.lst b/test-nsc/files/pos/ok.lst
deleted file mode 100644
index d9065d1c25..0000000000
--- a/test-nsc/files/pos/ok.lst
+++ /dev/null
@@ -1,138 +0,0 @@
-304.scala
-A.scala
-List1.scala
-MailBox.scala
-S1.scala
-S3.scala
-S5.scala
-S8.scala
-X.scala
-Z.scala
-abstract.scala
-aliases.scala
-arrays2.scala
-attributes.scala
-bug082.scala
-bug1.scala
-bug115.scala
-bug116.scala
-bug119.scala
-bug121.scala
-bug124.scala
-bug151.scala
-bug159.scala
-bug160.scala
-bug17.scala
-bug175.scala
-bug177.scala
-bug183.scala
-bug193.scala
-bug2.scala
-bug20.scala
-bug201.scala
-bug204.scala
-bug210.scala
-bug211.scala
-bug229.scala
-bug245.scala
-bug267.scala
-bug287.scala
-bug289.scala
-bug29.scala
-bug295.scala
-bug30.scala
-bug304.scala
-bug31.scala
-bug318.scala
-bug32.scala
-bug342.scala
-bug348plus.scala
-bug359.scala
-bug36.scala
-bug360.scala
-bug361.scala
-bug372.scala
-bug39.scala
-bug49.scala
-bug53.scala
-bug54.scala
-bug61.scala
-bug64.scala
-bug66.scala
-bug68.scala
-bug69.scala
-bug76.scala
-bug81.scala
-bug91.scala
-bug93.scala
-cls.scala
-cls1.scala
-clsrefine.scala
-compile.scala
-compound.scala
-constfold.scala
-eta.scala
-expressions-current.scala
-gui.scala
-imports.scala
-infer.scala
-infer2.scala
-lambda.scala
-lambdalift.scala
-lambdalift1.scala
-localmodules.scala
-matthias1.scala
-matthias3.scala
-matthias4.scala
-matthias5.scala
-maxim1.scala
-michel1.scala
-michel2.scala
-michel3.scala
-michel4.scala
-michel5.scala
-michel6.scala
-mixins.scala
-modules.scala
-modules1.scala
-moduletrans.scala
-nested.scala
-null.scala
-orderedpoints.scala
-override.scala
-partialfun.scala
-patterns.scala
-patterns1.scala
-patterns2.scala
-patterns3.scala
-philippe1.scala
-philippe2.scala
-philippe3.scala
-philippe4.scala
-pmbug.scala
-propagate.scala
-rebind.scala
-refine.scala
-reftest.scala
-scoping1.scala
-scoping2.scala
-scoping3.scala
-seqtest2.scala
-simplelists.scala
-stable.scala
-strings.scala
-test1.scala
-test2.scala
-test4.scala
-test4a.scala
-test4refine.scala
-test5.scala
-test5refine.scala
-testcast.scala
-thistype.scala
-thistypes.scala
-traits.scala
-valdefs.scala
-viewtest1.scala
-viewtest2.scala
-viewtest3.scala
diff --git a/test-nsc/files/pos/orderedpoints.scala b/test-nsc/files/pos/orderedpoints.scala
deleted file mode 100644
index 7e56a663fe..0000000000
--- a/test-nsc/files/pos/orderedpoints.scala
+++ /dev/null
@@ -1,30 +0,0 @@
-package test;
-
-class Point1(x: int) extends Object with Ordered[Point1] {
-  val xCoord = x;
-  def compareTo [b >: Point1 <% Ordered[b]](that: b): int = that match {
-    case that1: Point1 => this.xCoord.compareTo(that1.xCoord)
-    case _ => -that.compareTo(this)
-  }
-}
-class Point2(x: int, y: int) extends Point1(x) with Ordered[Point2] {}
-/*
-  val yCoord = y;
-  override def compareTo [b >: Point2 <% Ordered[b]](that: b): int = that match {
-    case that1: Point2 =>
-      val r = super.compareTo(that1);
-      if (r == 0) this.yCoord.compareTo(that1.yCoord) else r
-    case _ => -that.compareTo(this)
-  }
-}
-object Test extends Application {
-  val p1 = new Point1(1);
-  val q1 = new Point1(2);
-  System.out.println(p1 < q1);
-  val p2 = new Point2(1, 2);
-  val q2 = new Point2(1, 3);
-  System.out.println(p2 < q2);
-  System.out.println(p1 < q2);
-  System.out.println(p2 < q1);
-}
-*/
diff --git a/test-nsc/files/pos/override.scala b/test-nsc/files/pos/override.scala
deleted file mode 100644
index 9f068b8ecd..0000000000
--- a/test-nsc/files/pos/override.scala
+++ /dev/null
@@ -1,14 +0,0 @@
-trait A extends Object {
-  def f = 1;
-  val x: A;
-}
-
-trait B extends Object {
-  def f = 2;
-}
-
-trait C extends Object with A with B {
-  override def f = super[B].f;
-  val a: A;
-  val x: a.type = a;
-}
diff --git a/test-nsc/files/pos/partialfun.scala b/test-nsc/files/pos/partialfun.scala
deleted file mode 100644
index 21e4d0a096..0000000000
--- a/test-nsc/files/pos/partialfun.scala
+++ /dev/null
@@ -1,10 +0,0 @@
-object partialfun {
-
-  def applyPartial[b](f: PartialFunction[Option[String], b])(x: Option[String]) =
-    if (f.isDefinedAt(x)) f(x) else "<undefined>";
-
-  applyPartial {
-    case Some(xxx) => xxx
-  } (None);
-
-}
\ No newline at end of file
diff --git a/test-nsc/files/pos/patterns.scala b/test-nsc/files/pos/patterns.scala
deleted file mode 100644
index 93907e7d52..0000000000
--- a/test-nsc/files/pos/patterns.scala
+++ /dev/null
@@ -1,27 +0,0 @@
-trait Option[+a] {}
-case class Some[a](x: a) extends Option[a] {
-  override def toString(): String = "Some(" + x + ")";
-  override def equals(that: Any): Boolean = that match {
-    case Some(x) => this.x == x
-    case _ => false
-  }
-  override def hashCode(): scala.Int = getClass().hashCode() * 41 + x.hashCode();
-}
-case object None extends Option[All] {
-  override def toString(): String = "None";
-  override def equals(that: Any) = that match {
-    case None => true
-    case _ => false
-  }
-  override def hashCode(): scala.Int = getClass().hashCode();
-}
-
-object test {
-
-  def println(str: String): Unit = java.lang.System.out.println(str);
-
-  def print(opt: Option[String]) = opt match {
-    case Some(x) => println(x);
-    case None => println("nothing");
-  }
-}
diff --git a/test-nsc/files/pos/patterns1.scala b/test-nsc/files/pos/patterns1.scala
deleted file mode 100644
index fa542e7b06..0000000000
--- a/test-nsc/files/pos/patterns1.scala
+++ /dev/null
@@ -1,13 +0,0 @@
-trait Option[+a] {}
-case class Some[a](x: a) extends Option[a];
-case object None extends Option[All];
-
-object test {
-
-  def println(str: String): Unit = java.lang.System.out.println(str);
-
-  def print(opt: Option[String]) = opt match {
-    case Some(x) => println(x);
-    case None => println("nothing");
-  }
-}
\ No newline at end of file
diff --git a/test-nsc/files/pos/patterns2.scala b/test-nsc/files/pos/patterns2.scala
deleted file mode 100644
index 93dcedbcf8..0000000000
--- a/test-nsc/files/pos/patterns2.scala
+++ /dev/null
@@ -1,16 +0,0 @@
-trait Option {}
-case class Choice(a: Option, b: Option) extends Option;
-case class Some(x: java.lang.String) extends Option;
-case object None extends Option;
-
-object test {
-
-  def f(opt: Option) = opt match {
-    case Choice(Some("one"), Some(x)) => 1;
-    case Choice(Some("two"), None) => 1;
-    case Choice(y, Some("two")) => 2;
-    case Choice(Some(z), a) => 3;
-    case Some(b) => 4;
-    case None => 5;
-  }
-}
\ No newline at end of file
diff --git a/test-nsc/files/pos/patterns3.scala b/test-nsc/files/pos/patterns3.scala
deleted file mode 100644
index 001bd8989f..0000000000
--- a/test-nsc/files/pos/patterns3.scala
+++ /dev/null
@@ -1,5 +0,0 @@
-object M {
-
-  val Tuple2(Tuple2(x, y), _) = Tuple2(Tuple2(1, 2), 3);
-
-}
diff --git a/test-nsc/files/pos/philippe1.scala b/test-nsc/files/pos/philippe1.scala
deleted file mode 100644
index 3cace0e116..0000000000
--- a/test-nsc/files/pos/philippe1.scala
+++ /dev/null
@@ -1,8 +0,0 @@
-object test {
-  def id[a](xs: Array[a]): Array[a] = xs;
-
-  def main(args: Array[String]): Unit = {
-      val res: Array[String] = id(args);
-      ()
-  }
-}
\ No newline at end of file
diff --git a/test-nsc/files/pos/philippe2.scala b/test-nsc/files/pos/philippe2.scala
deleted file mode 100644
index 0dc896ebfd..0000000000
--- a/test-nsc/files/pos/philippe2.scala
+++ /dev/null
@@ -1,7 +0,0 @@
-
-import scala._;
-class m1() {
-  def n() = 0;
-  def foo(i: Int)(j: Int): Unit = ();
-  val bar = foo(n());
-}
diff --git a/test-nsc/files/pos/philippe3.scala b/test-nsc/files/pos/philippe3.scala
deleted file mode 100644
index 9442583997..0000000000
--- a/test-nsc/files/pos/philippe3.scala
+++ /dev/null
@@ -1,40 +0,0 @@
-
-class Foo(x: Int) {}
-case class Bar(y: Int) extends Foo(y);
-
-
-trait T {}
-trait U {}
-class C() {}
-
-
-trait T1;
-trait T2 {}
-trait T5 extends T;
-trait T6 extends T {}
-trait T7 extends T with U;
-trait T8 extends T with U {}
-
-class C1();
-class C2() {}
-class C5() extends C();
-class C6() extends C() {}
-class C7() extends C() with U;
-class C8() extends C() with U {}
-
-case class D1();
-case class D2() {}
-case class D5() extends C();
-case class D6() extends C() {}
-case class D7() extends C() with U;
-case class D8() extends C() with U {}
-
-object M1;
-object M2 {}
-object M5 extends C();
-object M6 extends C() {}
-object M7 extends C() with U;
-object M8 extends C() with U {}
-
-
-
diff --git a/test-nsc/files/pos/philippe4.scala b/test-nsc/files/pos/philippe4.scala
deleted file mode 100644
index c9b1cdaeb0..0000000000
--- a/test-nsc/files/pos/philippe4.scala
+++ /dev/null
@@ -1,3 +0,0 @@
-trait Foo[t <: Foo[t]]: t {
-  def foo(that: t): Boolean;
-}
diff --git a/test-nsc/files/pos/pmbug.scala b/test-nsc/files/pos/pmbug.scala
deleted file mode 100644
index 7d94e7a8bd..0000000000
--- a/test-nsc/files/pos/pmbug.scala
+++ /dev/null
@@ -1,8 +0,0 @@
-object Test {
-
-  def flatten[a](l: List[List[a]]): List[a] = l match {
-    case Nil => Nil
-    case head :: tail => head ::: flatten(tail)
-  }
-
-}
diff --git a/test-nsc/files/pos/propagate.scala b/test-nsc/files/pos/propagate.scala
deleted file mode 100644
index 84f4f5d6d2..0000000000
--- a/test-nsc/files/pos/propagate.scala
+++ /dev/null
@@ -1,17 +0,0 @@
-class C {
-
-  def f[a](x: a): a = {
-
-    class D() {
-      def g(x: a) = f(x): a;
-    }
-
-    new D().g(x);
-
-  }
-
-}
-
-
-
-
diff --git a/test-nsc/files/pos/rebind.scala b/test-nsc/files/pos/rebind.scala
deleted file mode 100644
index 3b7b27ac34..0000000000
--- a/test-nsc/files/pos/rebind.scala
+++ /dev/null
@@ -1,13 +0,0 @@
-abstract class Foo {
-  class Inner {
-    def inner: int = 1;
-  }
-  def foo: Inner;
-}
-trait Bar {
-  type Inner;
-  def foo: Inner = foo;
-}
-class Test extends Foo with Bar {
-  System.out.println(foo.inner);
-}
diff --git a/test-nsc/files/pos/refine.scala b/test-nsc/files/pos/refine.scala
deleted file mode 100644
index 5d175f26f5..0000000000
--- a/test-nsc/files/pos/refine.scala
+++ /dev/null
@@ -1,6 +0,0 @@
-object test {
-
-  val x: Object { def t(): String } = new Object {
-    def t(): String = "1";
-  }
-}
diff --git a/test-nsc/files/pos/reftest.scala b/test-nsc/files/pos/reftest.scala
deleted file mode 100644
index f709f70897..0000000000
--- a/test-nsc/files/pos/reftest.scala
+++ /dev/null
@@ -1,4 +0,0 @@
-import scala._;
-object test {
-  val x: Ref[Int] = new Ref(1);
-}
\ No newline at end of file
diff --git a/test-nsc/files/pos/scall.bat b/test-nsc/files/pos/scall.bat
deleted file mode 100755
index ba9ce6f131..0000000000
--- a/test-nsc/files/pos/scall.bat
+++ /dev/null
@@ -1,50 +0,0 @@
-scalac -prompt A.scala;

-scalac -prompt IntSet.scala;

-scalac -prompt List1.scala;

-scalac -prompt Rational.scala;

-scalac -prompt X.scala;

-scalac -prompt Y.scala;

-scalac -prompt Z.scala;

-scalac -prompt abstract.scala;

-scalac -prompt cls.scala;

-scalac -prompt cls1.scala;

-scalac -prompt clsrefine.scala;

-scalac -prompt cours1.scala;

-scalac -prompt cours2.scala;

-scalac -prompt cours2a.scala;

-scalac -prompt cours2b.scala;

-scalac -prompt cours2c.scala;

-scalac -prompt eta.scala;

-scalac -prompt exceptions.scala;

-scalac -prompt imports.scala;

-scalac -prompt lambda.scala;

-scalac -prompt lambdalift.scala;

-scalac -prompt lambdalift1.scala;

-scalac -prompt matthias1.scala;

-scalac -prompt maxim1.scala;

-scalac -prompt michel1.scala;

-scalac -prompt michel2.scala;

-scalac -prompt michel3.scala;

-scalac -prompt michel4.scala;

-scalac -prompt michel5.scala;

-scalac -prompt modules.scala;

-scalac -prompt modules1.scala;

-scalac -prompt moduletrans.scala;

-scalac -prompt nested.scala;

-scalac -prompt override.scala;

-scalac -prompt patterns.scala;

-scalac -prompt patterns2.scala;

-scalac -prompt philippe1.scala;

-scalac -prompt philippe2.scala;

-scalac -prompt reftest.scala;

-scalac -prompt sort1.scala;

-scalac -prompt sqrt.scala;

-scalac -prompt stable.scala;

-scalac -prompt strings.scala;

-scalac -prompt test1.scala;

-scalac -prompt test2.scala;

-scalac -prompt test4.scala;

-scalac -prompt test4a.scala;

-scalac -prompt test4refine.scala;

-scalac -prompt test5.scala;

-scalac -prompt test5refine.scala;

diff --git a/test-nsc/files/pos/scoping1.scala b/test-nsc/files/pos/scoping1.scala
deleted file mode 100644
index 23daf024fe..0000000000
--- a/test-nsc/files/pos/scoping1.scala
+++ /dev/null
@@ -1,12 +0,0 @@
-object This extends Application {
-     trait A {
-         def foo(): unit;
-     }
-     class C: A {
-         def bar() = this.foo();
-     }
-  class D extends C with A {
-    def foo() = ()
-  }
-  val c: C = new D;
-}
diff --git a/test-nsc/files/pos/scoping2.scala b/test-nsc/files/pos/scoping2.scala
deleted file mode 100644
index 39f3ef5f0e..0000000000
--- a/test-nsc/files/pos/scoping2.scala
+++ /dev/null
@@ -1,14 +0,0 @@
-object That {
-     trait A {
-         type T <: I;
-         trait I {}
-     }
-     trait B {
-     	type T <: J;
-     	trait J {}
-     }
-     trait C extends A with B {
-         type T <: I with J;
-     }
-}
-
diff --git a/test-nsc/files/pos/scoping3.scala b/test-nsc/files/pos/scoping3.scala
deleted file mode 100644
index 4ebc7f6378..0000000000
--- a/test-nsc/files/pos/scoping3.scala
+++ /dev/null
@@ -1,20 +0,0 @@
-object CI {
-   trait TreeDisplay {
-	type TreeNode <: ITreeNode;
-	trait ITreeNode {
-	  def display(): unit;
-	}
-   }
-   trait TreeDisplayExp {
-	def getRoot(): TreeNode;
-	type TreeNode <: ITreeNodeExp;
-	trait ITreeNodeExp {}
-   }
-   trait TreeDisplayFinal extends TreeDisplay with TreeDisplayExp {
-   	type TreeNode <: ITreeNode with ITreeNodeExp;
-   }
-   abstract class SimpleTreeDisplay: TreeDisplayFinal extends
-TreeDisplay {
-     def display() = { this.getRoot().display(); }
-   }
-}
diff --git a/test-nsc/files/pos/seqtest2.scala b/test-nsc/files/pos/seqtest2.scala
deleted file mode 100644
index 903b270c95..0000000000
--- a/test-nsc/files/pos/seqtest2.scala
+++ /dev/null
@@ -1,13 +0,0 @@
-object test {
-
-  val b = List(1, 2, 3);
-
-  def main(args: Array[String]) =
-   System.out.println(
-    b match {
-      case List(1, 2, 3) => true;
-      case _ => false;
-    }
-  )
-
-}
diff --git a/test-nsc/files/pos/simplelists.scala b/test-nsc/files/pos/simplelists.scala
deleted file mode 100644
index 73b04a8762..0000000000
--- a/test-nsc/files/pos/simplelists.scala
+++ /dev/null
@@ -1,17 +0,0 @@
-    abstract class List[+a] {
-      def head: a;
-      def tail: List[a];
-      def cons[b >: a](x: b): List[b] = new Cons[b, a](x, this);
-    }
-
-    object Nil extends List[All] {
-      def error(msg: String): All = throw new java.lang.Error(msg);
-      def head: All = error("Nil.head");
-      def tail: List[All] = error("Nil.tail");
-    }
-
-    class Cons[c, d <: c](x: c, xs: List[d]) extends List[c] {
-      def head: c = x;
-      def tail: List[c] = xs;
-    }
-
diff --git a/test-nsc/files/pos/stable.scala b/test-nsc/files/pos/stable.scala
deleted file mode 100644
index 267a36fe5c..0000000000
--- a/test-nsc/files/pos/stable.scala
+++ /dev/null
@@ -1,11 +0,0 @@
-trait Base {
-  val x: Int;
-  val y: Int;
-  var z: Int;
-}
-
-class Sub() extends Base {
-  val x: Int = 1;
-  val y: Int = 2;
-  var z: Int = 3;
-}
diff --git a/test-nsc/files/pos/strings.scala b/test-nsc/files/pos/strings.scala
deleted file mode 100644
index 3bf40e3dda..0000000000
--- a/test-nsc/files/pos/strings.scala
+++ /dev/null
@@ -1,6 +0,0 @@
-// martin 1-3-2002: it seems there is a problem with the way Serializable is loaded.
-object test {
-
-  def f() = "hello".concat("world");
-
-}
diff --git a/test-nsc/files/pos/test1.scala b/test-nsc/files/pos/test1.scala
deleted file mode 100644
index a36d2436ec..0000000000
--- a/test-nsc/files/pos/test1.scala
+++ /dev/null
@@ -1,5 +0,0 @@
-object test {
-
-  def f() = 5;
-
-}
diff --git a/test-nsc/files/pos/test2.scala b/test-nsc/files/pos/test2.scala
deleted file mode 100644
index fe36d07f1b..0000000000
--- a/test-nsc/files/pos/test2.scala
+++ /dev/null
@@ -1,5 +0,0 @@
-import scala._;
-object test2 {
-  def f(x: Int): Int = 'a';
-  def g(x: Int) = f(f(x));
-}
\ No newline at end of file
diff --git a/test-nsc/files/pos/test4.scala b/test-nsc/files/pos/test4.scala
deleted file mode 100644
index 4fe65a8f19..0000000000
--- a/test-nsc/files/pos/test4.scala
+++ /dev/null
@@ -1,47 +0,0 @@
-package test;
-
-trait C {}
-trait D {}
-trait E {}
-
-object test {
-  def c: C = c;
-  def d: D = d;
-  def e: E = e;
-}
-
-import test._;
-
-trait S extends ooo.I[D] {
-    def bar: E = foo(c,d);
-}
-
-class O[X]() {
-    trait I[Y] {
-        def foo(x: X, y: Y): E = e;
-    }
-    val i:I[E] = null;
-    val j:I[X] = null;
-}
-
-object ooo extends O[C]() {
-
-  def main = {
-    val s: S = null;
-    import s._;
-    foo(c,d);
-    ooo.i.foo(c,e);
-    ooo.j.foo(c,c);
-    bar
-  }
-}
-
-class Main() {
-  val s: S = null;
-  import s._;
-  foo(c,d);
-  ooo.i.foo(c,e);
-  ooo.j.foo(c,c);
-  bar;
-}
-
diff --git a/test-nsc/files/pos/test4a.scala b/test-nsc/files/pos/test4a.scala
deleted file mode 100644
index ada0ba4e5f..0000000000
--- a/test-nsc/files/pos/test4a.scala
+++ /dev/null
@@ -1,16 +0,0 @@
-trait C {}
-
-class O[X]() {
-    trait I[Y] {
-        def foo(y: Y): Y = y;
-    }
-    val j:I[X] = null;
-}
-
-object o extends O[C]() {
-  def c: C = c;
-  def main = {
-    o.j.foo(c);
-  }
-}
-
diff --git a/test-nsc/files/pos/test4refine.scala b/test-nsc/files/pos/test4refine.scala
deleted file mode 100644
index 6710962934..0000000000
--- a/test-nsc/files/pos/test4refine.scala
+++ /dev/null
@@ -1,49 +0,0 @@
-trait C {}
-trait D {}
-trait E {}
-
-object test {
-  def c: C = c;
-  def d: D = d;
-  def e: E = e;
-}
-
-import test._;
-
-trait S extends o.I {
-    type Y = D;
-    def bar: E = foo(c,d);
-}
-
-abstract class O() {
-    type X;
-    abstract trait I {
-	type Y;
-        def foo(x: X, y: Y): E = e;
-    }
-    val i:I { type Y = E } = null;
-    val j:I { type Y = X } = null;
-}
-
-object o extends O() {
-  type X = C;
-
-  def main = {
-    val s: S = null;
-    import s._;
-    foo(c,d);
-    o.i.foo(c,e);
-    o.j.foo(c,c);
-    bar
-  }
-}
-
-class Main() {
-  val s: S = null;
-  import s._;
-  foo(c,d);
-  o.i.foo(c,e);
-  o.j.foo(c,c);
-  bar;
-}
-
diff --git a/test-nsc/files/pos/test5.scala b/test-nsc/files/pos/test5.scala
deleted file mode 100644
index 4dbafc9ac3..0000000000
--- a/test-nsc/files/pos/test5.scala
+++ /dev/null
@@ -1,68 +0,0 @@
-import scala._;
-
-object test {
-
-  trait F[If] {}
-
-  def f[Jf](h: Jf):F[Jf] = f[Jf](h);
-
-  trait G[Ig] {}
-
-  def g[Jg](h: Jg):G[Jg] = g[Jg](h);
-
-  class M[P]() {
-      abstract class I[X]() {
-	  // Methods to check the type X and P as seen from instances of I
-	  def chk_ix(x: X): Unit = ();
-	  def chk_ip(p: P): Unit;
-
-	  // Value with type X as seen from instances of I
-	  def val_ix: X = val_ix;
-      }
-
-      val i:I[G[P]] = null;
-
-      // Values with types P and i.X as seen from instances of M
-      def val_mp: P = val_mp;
-      def val_mix: G[P] = g[P](val_mp);
-  }
-
-  class N[Q]() extends M[F[Q]]() {
-      val j:J[G[Q]] = null;
-
-      abstract class J[Y]() extends I[G[Y]]() {
-	  // Values with types Y and X as seen from instances of J
-	  def val_jy: Y = val_jy;
-	  def val_jx: G[Y] = g[Y](val_jy);
-
-	  // Check type P
-	  chk_ip(val_mp);
-	  chk_ip(val_np);
-      }
-
-      // Values with types Q, X.P, i.X, j.Y and j.X as seen from instances of N
-      def val_nq: Q = val_nq;
-      def val_np: F[Q] = f[Q](val_nq);
-      def val_nix: G[F[Q]] = g[F[Q]](val_np);
-      def val_njy: G[Q] = g[Q](val_nq);
-      def val_njx: G[G[Q]] = g[G[Q]](val_njy);
-
-      // Check type i.P
-      i.chk_ip(val_mp);
-      i.chk_ip(val_np);
-
-      // Check type j.P
-      j.chk_ip(val_mp);
-      j.chk_ip(val_np);
-
-      // Check type i.X
-      i.chk_ix(i.val_ix);
-      i.chk_ix(val_mix);
-      i.chk_ix(val_nix);
-
-      // Check j.X
-      j.chk_ix(j.val_ix);
-      j.chk_ix(j.val_jx);
-      j.chk_ix(val_njx);
-  }
-}
diff --git a/test-nsc/files/pos/test5refine.scala b/test-nsc/files/pos/test5refine.scala
deleted file mode 100644
index 95670faa05..0000000000
--- a/test-nsc/files/pos/test5refine.scala
+++ /dev/null
@@ -1,75 +0,0 @@
-import scala._;
-
-object test {
-
-  abstract trait F { type If; }
-
-  def f[Jf](h: Jf):F { type If = Jf } = f[Jf](h);
-
-  abstract trait G { type Ig; }
-
-  def g[Jg](h: Jg):G { type Ig = Jg } = g[Jg](h);
-
-  abstract class M() {
-      type P;
-      abstract class I() {
-	  type X;
-
-	  // Methods to check the type X and P as seen from instances of I
-	  def chk_ix(x: X): Unit = {}
-	  def chk_ip(p: P): Unit = {}
-
-	  // Value with type X as seen from instances of I
-	  def val_ix: X = val_ix;
-      }
-
-      val i: I { type X = G { type Ig = P } } = null;
-
-      // Values with types P and i.X as seen from instances of M
-      def val_mp: P = val_mp;
-      def val_mix: G { type Ig = P } = g[P](val_mp);
-  }
-
-  abstract class N() extends M() {
-      type Q;
-      type P = F { type If = Q };
-      val j:J { type Y = G { type Ig = Q } } = null;
-
-      abstract class J() extends I() {
-	  type Y;
-	  type X = G { type Ig = Y; };
-	  // Values with types Y and X as seen from instances of J
-	  def val_jy: Y = val_jy;
-	  def val_jx: G { type Ig = Y; } = g[Y](val_jy);
-
-	  // Check type P
-	  chk_ip(val_mp);
-	  chk_ip(val_np);
-      }
-
-      // Values with types Q, X.P, i.X, j.Y and j.X as seen from instances of N
-      def val_nq: Q = val_nq;
-      def val_np: F { type If = Q } = f[Q](val_nq);
-      def val_nix: G { type Ig = F { type If = Q } } = g[F { type If = Q }](val_np);
-      def val_njy: G { type Ig = Q; } = g[Q](val_nq);
-      def val_njx: G { type Ig = G { type Ig = Q }} = g[G { type Ig = Q; }](val_njy);
-
-      // Check type i.P
-      i.chk_ip(val_mp);
-      i.chk_ip(val_np);
-
-      // Check type j.P
-      j.chk_ip(val_mp);
-      j.chk_ip(val_np);
-
-      // Check type i.X
-      i.chk_ix(i.val_ix);
-      i.chk_ix(val_mix);
-      i.chk_ix(val_nix);
-
-      // Check j.X
-      j.chk_ix(j.val_ix);
-      j.chk_ix(j.val_jx);
-      j.chk_ix(val_njx);
-  }
-}
\ No newline at end of file
diff --git a/test-nsc/files/pos/testcast.scala b/test-nsc/files/pos/testcast.scala
deleted file mode 100644
index 631b2c922b..0000000000
--- a/test-nsc/files/pos/testcast.scala
+++ /dev/null
@@ -1,26 +0,0 @@
-package test;
-
-class A;
-
-class B extends A {
-  def foo: int = 1;
-}
-
-object B {
-  def view(x: B): B1 = null;
-}
-
-class B1 {
-  def bar: int = 1
-}
-
-object C {
-  implicit def view(x: A): B1 = null;
-}
-object Test {
-  import C.view;
-
-  val b: B = null;
-
-  System.out.println(b.bar);
-}
diff --git a/test-nsc/files/pos/thistype.scala b/test-nsc/files/pos/thistype.scala
deleted file mode 100644
index 8c0ba209be..0000000000
--- a/test-nsc/files/pos/thistype.scala
+++ /dev/null
@@ -1,14 +0,0 @@
-object Test {
-
-  class Ctl {
-    def enable: this.type = { System.out.println("enable"); this }
-  }
-
-  class MouseCtl extends Ctl {
-    def mouseDown(x: int, y: int): unit = { System.out.println("mouse down"); }
-  }
-
-  def main(args: Array[String]) =
-    new MouseCtl().enable.mouseDown(1, 2);
-
-}
diff --git a/test-nsc/files/pos/thistypes.scala b/test-nsc/files/pos/thistypes.scala
deleted file mode 100644
index 4a68ba3e65..0000000000
--- a/test-nsc/files/pos/thistypes.scala
+++ /dev/null
@@ -1,8 +0,0 @@
-trait B {
-  trait I {}
-  def foo: B.this.I;
-}
-
-trait C extends B {
-  def foo: C.this.I;
-}
\ No newline at end of file
diff --git a/test-nsc/files/pos/traits.scala b/test-nsc/files/pos/traits.scala
deleted file mode 100644
index 5fdf4b342e..0000000000
--- a/test-nsc/files/pos/traits.scala
+++ /dev/null
@@ -1,42 +0,0 @@
-object Test {
-  type Color = int;
-  trait Shape {
-    override def equals(other: Any) = true;
-  }
-  trait Bordered extends Shape {
-    val thickness: int;
-    override def equals(other: Any) = other match {
-      case that: Bordered => this.thickness == that.thickness;
-      case _ => false
-    }
-  }
-  trait Colored extends Shape {
-    val color: Color;
-    override def equals(other: Any) = other match {
-      case that: Colored => this.color == that.color;
-      case _ => false
-    }
-  }
-  trait BorderedColoredShape extends Shape with Bordered with Colored {
-    override def equals(other: Any) = other match {
-      case that: BorderedColoredShape =>
-	super.equals(that) &&
-        super[Bordered].equals(that) &&
-        super[Colored].equals(that)
-      case _ => false
-    }
-  }
-
-  val bcs1 = new BorderedColoredShape {
-    val thickness = 1;
-    val color = 0;
-  }
-  val bcs2 = new BorderedColoredShape {
-    val thickness = 2;
-    val color = 0;
-  }
-  System.out.println(bcs1 == bcs1);
-  System.out.println(bcs1 == bcs2);
-}
-
-
diff --git a/test-nsc/files/pos/valdefs.scala b/test-nsc/files/pos/valdefs.scala
deleted file mode 100644
index 85ffa132b7..0000000000
--- a/test-nsc/files/pos/valdefs.scala
+++ /dev/null
@@ -1,16 +0,0 @@
-object test {
-
-    abstract class Base() {
-      val x: String;
-      val y = 1.0;
-    }
-
-    case class Sub() extends Base() {
-      val x = "hello";
-      override val y = 2.0;
-    }
-
-    abstract class Sub2() extends Base() {
-      override val Pair(x, y) = Pair("abc", 2.0);
-    }
-}
diff --git a/test-nsc/files/pos/variances.scala b/test-nsc/files/pos/variances.scala
deleted file mode 100644
index 7dc56b0225..0000000000
--- a/test-nsc/files/pos/variances.scala
+++ /dev/null
@@ -1,8 +0,0 @@
-abstract class P[+a, +b] { // SLS, Example 4.4.2
-  def fst: a;
-  def snd: b
-}
-
-trait Vector[+a] { // SLS, Example 4.4.3 b)
-  def append[b >: a](x: Vector[b]): Vector[b]
-}
diff --git a/test-nsc/files/pos/viewtest1.scala b/test-nsc/files/pos/viewtest1.scala
deleted file mode 100644
index 0a59fdad58..0000000000
--- a/test-nsc/files/pos/viewtest1.scala
+++ /dev/null
@@ -1,41 +0,0 @@
-package test;
-
-trait Ordered[a] {
-  def < (x: a): boolean;
-}
-
-object O {
-  implicit def view (x: String): Ordered[String] = new Ordered[String] {
-    def < (y: String) = x.compareTo(y) < 0;
-  }
-}
-
-object Empty extends Tree[All];
-case class Node[c <% Ordered[c]](elem: c, l: Tree[c], r: Tree[c]) extends Tree[c];
-
-trait Tree[+a <% Ordered[a]] {
-  def insert[b >: a <% Ordered[b]](x: b): Tree[b] = this match {
-    case Empty => new Node(x, Empty, Empty)
-    case Node(elem, l, r) =>
-      if (x == elem) this
-      else if (x < elem) Node(elem, l insert x, r)
-      else Node(elem, l, r insert x);
-  }
-  def elements: List[a] = this match {
-    case Empty => List()
-    case Node(elem, l, r) =>
-      l.elements ::: List(elem) ::: r.elements
-  }
-}
-
-object Test {
-  import O.view;
-
-  def main(args: Array[String]) = {
-    var t: Tree[String] = Empty;
-    for (val s <- args) {
-      t = t insert s
-    }
-    System.out.println(t.elements)
-  }
-}
diff --git a/test-nsc/files/pos/viewtest2.scala b/test-nsc/files/pos/viewtest2.scala
deleted file mode 100644
index 1958696c1f..0000000000
--- a/test-nsc/files/pos/viewtest2.scala
+++ /dev/null
@@ -1,117 +0,0 @@
-package test;
-
-/** A trait for totally ordered data.
- */
-trait Ordered[+a] {
-
-  /** Result of comparing `this' with operand `that'.
-   *  returns `x' where
-   *  x < 0    iff    this < that
-   *  x == 0   iff    this == that
-   *  x > 0    iff    this > that
-   */
-  def compareTo [b >: a <% Ordered[b]](that: b): int;
-
-  def <  [b >: a <% Ordered[b]](that: b): boolean = (this compareTo that) <  0;
-
-  def >  [b >: a <% Ordered[b]](that: b): boolean = (this compareTo that) >  0;
-
-  def <= [b >: a <% Ordered[b]](that: b): boolean = (this compareTo that) <= 0;
-
-  def >= [b >: a <% Ordered[b]](that: b): boolean = (this compareTo that) >= 0;
-}
-
-
-object O {
-
-  implicit def view1(x: String): Ordered[String] = new Ordered[String] {
-    def compareTo [b >: String <% Ordered[b]](y: b): int = y match {
-      case y1: String => x compareTo y1;
-      case _ => -(y compareTo x)
-    }
-  }
-  implicit def view2(x: char): Ordered[char] = new Ordered[char] {
-    def compareTo [b >: char <% Ordered[b]](y: b): int = y match {
-      case y1: char => x - y1;
-      case _ => -(y compareTo x)
-    }
-  }
-
-  implicit def view3[a <% Ordered[a]](x: List[a]): Ordered[List[a]] =
-    new Ordered[List[a]] {
-      def compareTo [b >: List[a] <% Ordered[b]](y: b): int = y match {
-	case y1: List[a] => compareLists(x, y1);
-	case _ => -(y compareTo x)
-      }
-      private def compareLists(xs: List[a], ys: List[a]): int = {
-	if (xs.isEmpty && ys.isEmpty) 0
-	else if (xs.isEmpty) -1
-	else if (ys.isEmpty) 1
-	else {
-	  val s = xs.head compareTo ys.head;
-	  if (s != 0) s
-	  else compareLists(xs.tail, ys.tail)
-	}
-      }
-    }
-
-  implicit def view4[a](x: a): a = x;
-}
-
-trait Tree[+a <% Ordered[a]] {
-  def insert[b >: a <% Ordered[b]](x: b): Tree[b];
-  def elements: List[a]
-}
-
-object Empty extends Tree[All] {
-  def insert[b >: All <% Ordered[b]](x: b): Tree[b] = new Node(x, Empty, Empty);
-  def elements: List[All] = List();
-}
-
-class Node[a <% Ordered[a]](elem: a, l: Tree[a], r: Tree[a]) extends Tree[a] {
-  def insert[b >: a <% Ordered[b]](x: b): Tree[b] =
-    if (x == elem) this
-    else if (x < elem) new Node(elem, l insert x, r)
-    else new Node(elem, l, r insert x);
-  def elements: List[a] =
-    l.elements ::: List(elem) ::: r.elements
-}
-
-case class Str(elem: String) extends Ordered[Str] {
-  def compareTo[b >: Str <% Ordered[b]](that: b): int = that match {
-    case that1: Str => this.elem compareTo that1.elem
-    case _ => -(that compareTo this)
-  }
-}
-
-object Test {
-  import O._;
-
-  private def toCharList(s: String): List[Char] =
-    if (s.length() == 0) List()
-    else s.charAt(0) :: toCharList(s.substring(1));
-
-  def main(args: Array[String]) = {
-    {
-      var t: Tree[String] = Empty;
-      for (val s <- args) {
-	t = t insert s
-      }
-      System.out.println(t.elements)
-    }
-    {
-      var t: Tree[Str] = Empty;
-      for (val s <- args) {
-	t = t insert Str(s)
-      }
-      System.out.println(t.elements)
-    }
-    {
-      var t: Tree[List[char]] = Empty;
-      for (val s <- args) {
-	t = t insert toCharList(s)
-      }
-      System.out.println(t.elements)
-    }
-  }
-}
diff --git a/test-nsc/files/pos/viewtest3.scala b/test-nsc/files/pos/viewtest3.scala
deleted file mode 100644
index 89e32e48a8..0000000000
--- a/test-nsc/files/pos/viewtest3.scala
+++ /dev/null
@@ -1,59 +0,0 @@
-package testview;
-
-trait Tree[+a <% Ordered[a]] {
-  def insert[b >: a <% Ordered[b]](x: b): Tree[b];
-  def elements: List[a]
-}
-
-object Empty extends Tree[All] {
-  def insert[b >: All <% Ordered[b]](x: b): Tree[b] = new Node(x, Empty, Empty);
-  def elements: List[All] = List();
-}
-
-class Node[a <% Ordered[a]](elem: a, l: Tree[a], r: Tree[a]) extends Tree[a] {
-  def insert[b >: a <% Ordered[b]](x: b): Tree[b] =
-    if (x == elem) this
-    else if (x < elem) new Node(elem, l insert x, r)
-    else new Node(elem, l, r insert x);
-  def elements: List[a] =
-    l.elements ::: List(elem) ::: r.elements
-}
-
-case class Str(elem: String) extends Ordered[Str] {
-  def compareTo[b >: Str <% Ordered[b]](that: b): int = that match {
-    case that1: Str => this.elem compareTo that1.elem
-    case _ => -(that compareTo this)
-  }
-}
-
-object Test {
-//  import O.view;
-
-  private def toCharList(s: String): List[Char] =
-    if (s.length() == 0) List()
-    else s.charAt(0) :: toCharList(s.substring(1));
-
-  def main(args: Array[String]) = {
-    {
-      var t: Tree[String] = Empty;
-      for (val s <- args) {
-	t = t insert s
-      }
-      System.out.println(t.elements)
-    }
-    {
-      var t: Tree[Str] = Empty;
-      for (val s <- args) {
-	t = t insert Str(s)
-      }
-      System.out.println(t.elements)
-    }
-    {
-      var t: Tree[List[char]] = Empty;
-      for (val s <- args) {
-	t = t insert toCharList(s)
-      }
-      System.out.println(t.elements)
-    }
-  }
-}