Added NameTree Tree interface.

2 files changed, 12 insertions, 18 deletions

diff --git a/src/compiler/scala/reflect/internal/Trees.scala b/src/compiler/scala/reflect/internal/Trees.scala
index 0413fd9896..5f1a8f3fbe 100644
--- a/src/compiler/scala/reflect/internal/Trees.scala
+++ b/src/compiler/scala/reflect/internal/Trees.scala
@@ -144,11 +144,9 @@ trait Trees extends api.Trees { self: SymbolTable =>
      *  less than the whole tree.
      */
     def summaryString: String = tree match {
-      case Select(qual, name) => qual.summaryString + "." + name.decode
-      case Ident(name)        => name.longString
       case Literal(const)     => "Literal(" + const + ")"
-      case t: DefTree         => t.shortClass + " `" + t.name.decode + "`"
-      case t: RefTree         => t.shortClass + " `" + t.name.longString + "`"
+      case Select(qual, name) => qual.summaryString + "." + name.decode
+      case t: NameTree        => t.name.longString
       case t                  =>
         t.shortClass + (
           if (t.symbol != null && t.symbol != NoSymbol) " " + t.symbol
diff --git a/src/compiler/scala/tools/nsc/typechecker/TreeCheckers.scala b/src/compiler/scala/tools/nsc/typechecker/TreeCheckers.scala
index 45d916c633..4319dd10c7 100644
--- a/src/compiler/scala/tools/nsc/typechecker/TreeCheckers.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/TreeCheckers.scala
@@ -14,8 +14,9 @@ import util.returning
 abstract class TreeCheckers extends Analyzer {
   import global._
 
-  private val everything = ListBuffer[(Phase, Map[Tree, (Symbol, Type)])]()
+  private val everything   = ListBuffer[(Phase, Map[Tree, (Symbol, Type)])]()
   private val currentTrees = mutable.Map[Tree, (Symbol, Type)]()
+  private val tpeOfTree    = mutable.HashMap[Tree, Type]()
 
   if (settings.debug.value) {
     sys addShutdownHook {
@@ -49,12 +50,13 @@ abstract class TreeCheckers extends Analyzer {
   object SymbolTracker extends Traverser {
     type PhaseMap = mutable.HashMap[Symbol, List[Tree]]
 
+    val defSyms       = mutable.HashMap[Symbol, List[DefTree]]() withDefaultValue Nil
+    val newSyms       = mutable.HashSet[Symbol]()
     val maps          = ListBuffer[(Phase, PhaseMap)]()
+    val movedMsgs     = ListBuffer[String]()
+
     def prev          = maps.init.last._2
     def latest        = maps.last._2
-    val defSyms       = mutable.HashMap[Symbol, List[DefTree]]()
-    val newSyms       = mutable.HashSet[Symbol]()
-    val movedMsgs     = new ListBuffer[String]
     def sortedNewSyms = newSyms.toList.distinct sortBy (_.name.toString)
 
     def inPrev(sym: Symbol) = {
@@ -119,10 +121,8 @@ abstract class TreeCheckers extends Analyzer {
       if (sym != null && sym != NoSymbol) {
         record(sym, tree)
         tree match {
-          case x: DefTree =>
-            if (defSyms contains sym) defSyms(sym) = defSyms(sym) :+ x
-            else defSyms(sym) = List(x)
-          case _ => ()
+          case x: DefTree => defSyms(sym) :+= x
+          case _          => ()
         }
       }
 
@@ -130,8 +130,6 @@ abstract class TreeCheckers extends Analyzer {
     }
   }
 
-  lazy val tpeOfTree = mutable.HashMap[Tree, Type]()
-
   def posstr(p: Position) =
     try p.source.path + ":" + p.line
     catch { case _: UnsupportedOperationException => p.toString }
@@ -147,9 +145,7 @@ abstract class TreeCheckers extends Analyzer {
     if (!cond) errorFn(msg)
 
   def checkTrees() {
-    if (settings.verbose.value)
-      Console.println("[consistency check at the beginning of phase " + phase + "]")
-
+    informFn("[consistency check at the beginning of phase " + phase + "]")
     currentRun.units foreach check
   }
 
@@ -172,7 +168,7 @@ abstract class TreeCheckers extends Analyzer {
     informProgress("checking "+unit)
     val context = rootContext(unit)
     context.checking = true
-    tpeOfTree.clear
+    tpeOfTree.clear()
     SymbolTracker.check(phase, unit)
     val checker = new TreeChecker(context)
     runWithUnit(unit) {