1 files changed, 1 insertions, 35 deletions

diff --git a/src/compiler/scala/tools/nsc/matching/Patterns.scala b/src/compiler/scala/tools/nsc/matching/Patterns.scala
index e92c43f1fd..df536da108 100644
--- a/src/compiler/scala/tools/nsc/matching/Patterns.scala
+++ b/src/compiler/scala/tools/nsc/matching/Patterns.scala
@@ -32,9 +32,6 @@ trait Patterns extends ast.TreeDSL {
   // An empty pattern
   def NoPattern = WildcardPattern()
 
-  // The constant null pattern
-  def NullPattern = LiteralPattern(NULL)
-
   // The Nil pattern
   def NilPattern = Pattern(gen.mkNil)
 
@@ -60,7 +57,6 @@ trait Patterns extends ast.TreeDSL {
 
     override def covers(sym: Symbol) = newMatchesPattern(sym, tpt.tpe)
     override def sufficientType = tpt.tpe
-    override def subpatternsForVars: List[Pattern] = List(Pattern(expr))
     override def simplify(pv: PatternVar) = Pattern(expr) match {
       case ExtractorPattern(ua) if pv.sym.tpe <:< tpt.tpe => this rebindTo expr
       case _                                              => this
@@ -140,10 +136,6 @@ trait Patterns extends ast.TreeDSL {
     require(fn.isType && this.isCaseClass, "tree: " + tree + " fn: " + fn)
     def name = tpe.typeSymbol.name
     def cleanName = tpe.typeSymbol.decodedName
-    def hasPrefix = tpe.prefix.prefixString != ""
-    def prefixedName =
-      if (hasPrefix) "%s.%s".format(tpe.prefix.prefixString, cleanName)
-      else cleanName
 
     private def isColonColon = cleanName == "::"
 
@@ -222,15 +214,13 @@ trait Patterns extends ast.TreeDSL {
 
   // 8.1.8 (b) (literal ArrayValues)
   case class SequencePattern(tree: ArrayValue) extends Pattern with SequenceLikePattern {
-    lazy val ArrayValue(elemtpt, elems) = tree
+    lazy val ArrayValue(_, elems) = tree
 
-    override def subpatternsForVars: List[Pattern] = elemPatterns
     override def description = "Seq(%s)".format(elemPatterns mkString ", ")
   }
 
   // 8.1.8 (c)
   case class StarPattern(tree: Star) extends Pattern {
-    lazy val Star(elem) = tree
     override def description = "_*"
   }
   // XXX temporary?
@@ -384,15 +374,7 @@ trait Patterns extends ast.TreeDSL {
     // Covers if the symbol matches the unapply method's argument type,
     // and the return type of the unapply is Some.
     override def covers(sym: Symbol) = newMatchesPattern(sym, arg.tpe)
-
-    // TODO: for alwaysCovers:
-    //   fn.tpe.finalResultType.typeSymbol == SomeClass
-
     override def necessaryType = arg.tpe
-    override def subpatternsForVars = args match {
-      case List(ArrayValue(elemtpe, elems)) => toPats(elems)
-      case _                                => toPats(args)
-    }
 
     def resTypes = analyzer.unapplyTypeList(unfn.symbol, unfn.tpe, args.length)
     def resTypesString = resTypes match {
@@ -403,13 +385,7 @@ trait Patterns extends ast.TreeDSL {
 
   sealed trait ApplyPattern extends Pattern {
     lazy val Apply(fn, args) = tree
-    override def subpatternsForVars: List[Pattern] = toPats(args)
-
-    override def dummies =
-      if (!this.isCaseClass) Nil
-      else emptyPatterns(sufficientType.typeSymbol.caseFieldAccessors.size)
 
-    def isConstructorPattern = fn.isType
     override def covers(sym: Symbol) = newMatchesPattern(sym, fn.tpe)
   }
 
@@ -419,9 +395,6 @@ trait Patterns extends ast.TreeDSL {
     // returns either a simplification of this pattern or identity.
     def simplify(pv: PatternVar): Pattern = this
 
-    // the right number of dummies for this pattern
-    def dummies: List[Pattern] = Nil
-
     // Is this a default pattern (untyped "_" or an EmptyTree inserted by the matcher)
     def isDefault = false
 
@@ -451,14 +424,8 @@ trait Patterns extends ast.TreeDSL {
     def isModule    = sym.isModule || tpe.termSymbol.isModule
     def isCaseClass = tpe.typeSymbol.isCase
     def isObject    = (sym != null) && (sym != NoSymbol) && tpe.prefix.isStable  // XXX not entire logic
-
     def hasStar = false
 
-    def setType(tpe: Type): this.type = {
-      tree setType tpe
-      this
-    }
-
     def equalsCheck =
       tracing("equalsCheck")(
         if (sym.isValue) singleType(NoPrefix, sym)
@@ -475,7 +442,6 @@ trait Patterns extends ast.TreeDSL {
 
     final override def toString = description
 
-    def toTypeString() = "%s <: x <: %s".format(necessaryType, sufficientType)
     def kindString = ""
   }