Deprecated some classes.

All this stuff.  I believe most of this is uncontroversial.

  scala/util/Marshal.scala
  scala/util/automata/BaseBerrySethi.scala
  scala/util/automata/DetWordAutom.scala
  scala/util/automata/Inclusion.scala
  scala/util/automata/NondetWordAutom.scala
  scala/util/automata/SubsetConstruction.scala
  scala/util/automata/WordBerrySethi.scala
  scala/util/grammar/HedgeRHS.scala
  scala/util/grammar/TreeRHS.scala
  scala/util/parsing/ast/AbstractSyntax.scala
  scala/util/parsing/ast/Binders.scala
  scala/util/parsing/combinator/testing/RegexTest.scala
  scala/util/parsing/combinator/testing/Tester.scala
  scala/util/parsing/input/Positional.scala
  scala/util/regexp/Base.scala
  scala/util/regexp/PointedHedgeExp.scala
  scala/util/regexp/SyntaxError.scala
  scala/util/regexp/WordExp.scala

I'd have deprecated much of it long ago if the compiler didn't
still depend on it due to xml/dtd/something.  And it still does,
but it's time to deprecate them anyway.

18 files changed, 28 insertions, 2 deletions

diff --git a/src/library/scala/util/Marshal.scala b/src/library/scala/util/Marshal.scala
index e2ebe7851c..209cd6c062 100644
--- a/src/library/scala/util/Marshal.scala
+++ b/src/library/scala/util/Marshal.scala
@@ -16,6 +16,7 @@ package scala.util
  * @author Stephane Micheloud
  * @version 1.0
  */
+@deprecated("This class will be removed", "2.10.0")
 object Marshal {
   import java.io._
   import scala.reflect.ClassTag
diff --git a/src/library/scala/util/automata/BaseBerrySethi.scala b/src/library/scala/util/automata/BaseBerrySethi.scala
index c78b2d0790..f2d24b941f 100644
--- a/src/library/scala/util/automata/BaseBerrySethi.scala
+++ b/src/library/scala/util/automata/BaseBerrySethi.scala
@@ -17,6 +17,7 @@ import scala.collection.{ mutable, immutable }
   * [[scala.util.automata.NondetWordAutom]] over `A` using the celebrated
   * position automata construction (also called ''Berry-Sethi'' or ''Glushkov'').
   */
+@deprecated("This class will be removed", "2.10.0")
 abstract class BaseBerrySethi {
   val lang: Base
   import lang.{ Alt, Eps, Meta, RegExp, Sequ, Star }
diff --git a/src/library/scala/util/automata/DetWordAutom.scala b/src/library/scala/util/automata/DetWordAutom.scala
index 16c5d2944b..c6d72f1a06 100644
--- a/src/library/scala/util/automata/DetWordAutom.scala
+++ b/src/library/scala/util/automata/DetWordAutom.scala
@@ -20,6 +20,7 @@ import scala.collection.{ mutable, immutable }
  *  @author Burak Emir
  *  @version 1.0
  */
+@deprecated("This class will be removed", "2.10.0")
 abstract class DetWordAutom[T <: AnyRef] {
   val nstates: Int
   val finals: Array[Int]
diff --git a/src/library/scala/util/automata/Inclusion.scala b/src/library/scala/util/automata/Inclusion.scala
index 63133998b4..4e87783a66 100644
--- a/src/library/scala/util/automata/Inclusion.scala
+++ b/src/library/scala/util/automata/Inclusion.scala
@@ -17,6 +17,7 @@ package scala.util.automata
  *  @author Burak Emir
  *  @version 1.0
  */
+@deprecated("This class will be removed", "2.10.0")
 trait Inclusion[A <: AnyRef] {
 
   val labels: Seq[A]
diff --git a/src/library/scala/util/automata/NondetWordAutom.scala b/src/library/scala/util/automata/NondetWordAutom.scala
index b09e82ca11..3b6f0b251a 100644
--- a/src/library/scala/util/automata/NondetWordAutom.scala
+++ b/src/library/scala/util/automata/NondetWordAutom.scala
@@ -17,6 +17,7 @@ import scala.collection.{ immutable, mutable }
  *  All states are reachable. Accepting states are those for which
  *  the partial function `finals` is defined.
  */
+@deprecated("This class will be removed", "2.10.0")
 abstract class NondetWordAutom[T <: AnyRef] {
   val nstates: Int
   val labels: Seq[T]
diff --git a/src/library/scala/util/automata/SubsetConstruction.scala b/src/library/scala/util/automata/SubsetConstruction.scala
index 81805fce2f..1cdcd734cd 100644
--- a/src/library/scala/util/automata/SubsetConstruction.scala
+++ b/src/library/scala/util/automata/SubsetConstruction.scala
@@ -10,6 +10,7 @@ package scala.util.automata
 
 import scala.collection.{ mutable, immutable }
 
+@deprecated("This class will be removed", "2.10.0")
 class SubsetConstruction[T <: AnyRef](val nfa: NondetWordAutom[T]) {
   import nfa.labels
 
diff --git a/src/library/scala/util/automata/WordBerrySethi.scala b/src/library/scala/util/automata/WordBerrySethi.scala
index a7ad92e648..5dee6d2d0a 100644
--- a/src/library/scala/util/automata/WordBerrySethi.scala
+++ b/src/library/scala/util/automata/WordBerrySethi.scala
@@ -17,6 +17,7 @@ import scala.util.regexp.WordExp
   *  @author Burak Emir
   *  @version 1.0
   */
+@deprecated("This class will be removed", "2.10.0")
 abstract class WordBerrySethi extends BaseBerrySethi {
   override val lang: WordExp
 
diff --git a/src/library/scala/util/grammar/HedgeRHS.scala b/src/library/scala/util/grammar/HedgeRHS.scala
index 8fb3d4c5dc..da109f41c5 100644
--- a/src/library/scala/util/grammar/HedgeRHS.scala
+++ b/src/library/scala/util/grammar/HedgeRHS.scala
@@ -10,13 +10,17 @@
 
 package scala.util.grammar
 
+@deprecated("This class will be removed", "2.10.0")
 abstract class HedgeRHS
 
 /** Right hand side of a hedge production, deriving a single tree. */
+@deprecated("This class will be removed", "2.10.0")
 case class ConsRHS(tnt: Int, hnt: Int) extends HedgeRHS
 
 /** Right hand side of a hedge production, deriving any hedge. */
+@deprecated("This class will be removed", "2.10.0")
 case object AnyHedgeRHS extends HedgeRHS
 
 /** Right hand side of a hedge production, deriving the empty hedge. */
+@deprecated("This class will be removed", "2.10.0")
 case object EmptyHedgeRHS extends HedgeRHS
diff --git a/src/library/scala/util/grammar/TreeRHS.scala b/src/library/scala/util/grammar/TreeRHS.scala
index ebe16b25bd..d6e7c01588 100644
--- a/src/library/scala/util/grammar/TreeRHS.scala
+++ b/src/library/scala/util/grammar/TreeRHS.scala
@@ -11,9 +11,12 @@
 package scala.util.grammar
 
 /** Right hand side of a tree production. */
+@deprecated("This class will be removed", "2.10.0")
 abstract class TreeRHS
 
 /** Right hand side of a tree production, labelled with a letter from an alphabet. */
+@deprecated("This class will be removed", "2.10.0")
 case class LabelledRHS[A](label: A, hnt: Int) extends TreeRHS
 
+@deprecated("This class will be removed", "2.10.0")
 case object AnyTreeRHS extends TreeRHS
diff --git a/src/library/scala/util/parsing/ast/AbstractSyntax.scala b/src/library/scala/util/parsing/ast/AbstractSyntax.scala
index 220643a0d7..67e8a87221 100644
--- a/src/library/scala/util/parsing/ast/AbstractSyntax.scala
+++ b/src/library/scala/util/parsing/ast/AbstractSyntax.scala
@@ -14,6 +14,7 @@ import scala.util.parsing.input.Positional
  *
  * @author Adriaan Moors
  */
+@deprecated("This class will be removed", "2.10.0")
 trait AbstractSyntax {
   /** The base class for elements of the abstract syntax tree.
    */
diff --git a/src/library/scala/util/parsing/ast/Binders.scala b/src/library/scala/util/parsing/ast/Binders.scala
index 09ad5ce2ab..cb8401702c 100644
--- a/src/library/scala/util/parsing/ast/Binders.scala
+++ b/src/library/scala/util/parsing/ast/Binders.scala
@@ -24,6 +24,7 @@ import language.implicitConversions
  *
  *  @author Adriaan Moors
  */
+@deprecated("This class will be removed", "2.10.0")
 trait Mappable {
   trait Mapper { def apply[T <% Mappable[T]](x: T): T } /* TODO: having type `Forall T. T => T` is too strict:
   sometimes we want to allow `Forall T >: precision. T => T` for some type `precision`, so that,
diff --git a/src/library/scala/util/parsing/combinator/testing/RegexTest.scala b/src/library/scala/util/parsing/combinator/testing/RegexTest.scala
index 255730e5db..ff3554a6af 100644
--- a/src/library/scala/util/parsing/combinator/testing/RegexTest.scala
+++ b/src/library/scala/util/parsing/combinator/testing/RegexTest.scala
@@ -5,10 +5,14 @@ import scala.util.parsing.combinator._
 import scala.util.parsing.input._
 import language.postfixOps
 
+@deprecated("This class will be removed", "2.10.0")
 case class Ident(s: String)
+@deprecated("This class will be removed", "2.10.0")
 case class Number(n: Int)
+@deprecated("This class will be removed", "2.10.0")
 case class Str(s: String)
 
+@deprecated("This class will be removed", "2.10.0")
 object RegexTest extends RegexParsers {
   val ident: Parser[Any] = """[a-zA-Z_]\w*""".r ^^ (s => Ident(s))
   val number: Parser[Any] = """\d\d*""".r ^^ (s => Number(s.toInt))
diff --git a/src/library/scala/util/parsing/combinator/testing/Tester.scala b/src/library/scala/util/parsing/combinator/testing/Tester.scala
index 4607dc8843..1b98d63289 100644
--- a/src/library/scala/util/parsing/combinator/testing/Tester.scala
+++ b/src/library/scala/util/parsing/combinator/testing/Tester.scala
@@ -28,6 +28,7 @@ import scala.util.parsing.combinator.syntactical.TokenParsers
  * @author Martin Odersky
  * @author Adriaan Moors
  */
+@deprecated("This class will be removed", "2.10.0")
 abstract class Tester {
 
   val syntactic: TokenParsers { val lexical: Lexical }
diff --git a/src/library/scala/util/parsing/input/Positional.scala b/src/library/scala/util/parsing/input/Positional.scala
index ff9d81d4e5..2e9163d5ad 100644
--- a/src/library/scala/util/parsing/input/Positional.scala
+++ b/src/library/scala/util/parsing/input/Positional.scala
@@ -12,6 +12,7 @@ package scala.util.parsing.input
  *
  * @author Martin Odersky, Adriaan Moors
  */
+@deprecated("This class will be removed", "2.10.0")
 trait Positional {
 
   /** The source position of this object, initially set to undefined. */
diff --git a/src/library/scala/util/regexp/Base.scala b/src/library/scala/util/regexp/Base.scala
index 8e23d46eb9..81962ea8bd 100644
--- a/src/library/scala/util/regexp/Base.scala
+++ b/src/library/scala/util/regexp/Base.scala
@@ -15,8 +15,9 @@ package scala.util.regexp
  *  @author  Burak Emir
  *  @version 1.0
  */
-abstract class Base
-{
+
+@deprecated("This class will be removed", "2.10.0")
+abstract class Base {
   type _regexpT <: RegExp
 
   abstract class RegExp {
diff --git a/src/library/scala/util/regexp/PointedHedgeExp.scala b/src/library/scala/util/regexp/PointedHedgeExp.scala
index 23aa46448c..056031a339 100644
--- a/src/library/scala/util/regexp/PointedHedgeExp.scala
+++ b/src/library/scala/util/regexp/PointedHedgeExp.scala
@@ -15,6 +15,7 @@ package scala.util.regexp
  *  @author  Burak Emir
  *  @version 1.0
  */
+@deprecated("This class will be removed", "2.10.0")
 abstract class PointedHedgeExp extends Base {
 
   type _regexpT <: RegExp
diff --git a/src/library/scala/util/regexp/SyntaxError.scala b/src/library/scala/util/regexp/SyntaxError.scala
index 0f5c2af187..c19dfe126e 100644
--- a/src/library/scala/util/regexp/SyntaxError.scala
+++ b/src/library/scala/util/regexp/SyntaxError.scala
@@ -16,4 +16,5 @@ package scala.util.regexp
  *  @author  Burak Emir
  *  @version 1.0
  */
+@deprecated("This class will be removed", "2.10.0")
 class SyntaxError(e: String) extends RuntimeException(e)
diff --git a/src/library/scala/util/regexp/WordExp.scala b/src/library/scala/util/regexp/WordExp.scala
index cf146934d1..05674f118c 100644
--- a/src/library/scala/util/regexp/WordExp.scala
+++ b/src/library/scala/util/regexp/WordExp.scala
@@ -38,6 +38,7 @@ package scala.util.regexp
  *  @author  Burak Emir
  *  @version 1.0
  */
+@deprecated("This class will be removed", "2.10.0")
 abstract class WordExp extends Base {
 
   abstract class Label