Removed scala/Ref.java

6 files changed, 2 insertions, 99 deletions

diff --git a/lib/scala-compiler.jar.desired.sha1 b/lib/scala-compiler.jar.desired.sha1
index a38d385aff..62423c5d0f 100644
--- a/lib/scala-compiler.jar.desired.sha1
+++ b/lib/scala-compiler.jar.desired.sha1
@@ -1 +1 @@
-9f9690182034ee821828bed204bf959bdae43ccc ?scala-compiler.jar
+2feddc43b8807ad9ee424c04de4d5dc1bb72c226 ?scala-compiler.jar
diff --git a/lib/scala-library.jar.desired.sha1 b/lib/scala-library.jar.desired.sha1
index 3e9291df34..92c71fb4ab 100644
--- a/lib/scala-library.jar.desired.sha1
+++ b/lib/scala-library.jar.desired.sha1
@@ -1 +1 @@
-2d1caf29dde3f0fb1610098ec65e873d3d85ff07 ?scala-library.jar
+a3c1ace52d6877376c9b15ff1eddc0a97edbeaaa ?scala-library.jar
diff --git a/src/compiler/scala/tools/nsc/symtab/Definitions.scala b/src/compiler/scala/tools/nsc/symtab/Definitions.scala
index ae505bf6c4..8002abc431 100644
--- a/src/compiler/scala/tools/nsc/symtab/Definitions.scala
+++ b/src/compiler/scala/tools/nsc/symtab/Definitions.scala
@@ -57,7 +57,6 @@ trait Definitions requires SymbolTable {
     var ScalaObjectClass: Symbol = _;
       def ScalaObjectClass_tag = getMember(ScalaObjectClass, nme.tag);
     var AttributeClass: Symbol = _;
-    var RefClass: Symbol = _;
     //var RemoteRefClass: Symbol = _
     var TypedCodeClass: Symbol = _;
     var CodeClass: Symbol = _;
@@ -455,7 +454,6 @@ trait Definitions requires SymbolTable {
       // the scala reference classes
       ScalaObjectClass = getClass("scala.ScalaObject");
       AttributeClass = getClass("scala.Attribute");
-      RefClass = getClass("scala.Ref");
       //RemoteRefClass = getClass("scala.distributed.RemoteRef");
       CodeClass = getClass("scala.reflect.Code");
       CodeModule = getModule("scala.reflect.Code");
diff --git a/src/library/scala/Ref.java b/src/library/scala/Ref.java
deleted file mode 100644
index ef82bb9717..0000000000
--- a/src/library/scala/Ref.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*                     __                                               *\
-**     ________ ___   / /  ___     Scala API                            **
-**    / __/ __// _ | / /  / _ |    (c) 2002-2006, LAMP/EPFL             **
-**  __\ \/ /__/ __ |/ /__/ __ |                                         **
-** /____/\___/_/ |_/____/_/ | |                                         **
-**                          |/                                          **
-\*                                                                      */
-
-// $Id$
-
-
-package scala;
-
-
-/** @meta class [?T] extends java.lang.Object with java.io.Serializable;
- */
-public class Ref extends java.lang.Object implements java.io.Serializable {
-
-    /** @meta field ?T;
-     */
-    public java.lang.Object elem = null;
-
-    /** @meta constr (?T);
-     */
-    public Ref(java.lang.Object x) {
-	elem = x;
-    }
-}
diff --git a/test/files/pos/expressions-current.scala b/test/files/pos/expressions-current.scala
deleted file mode 100644
index b383ad949d..0000000000
--- a/test/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]) requires 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]) requires 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]) requires 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/files/pos/reftest.scala b/test/files/pos/reftest.scala
deleted file mode 100644
index f709f70897..0000000000
--- a/test/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