A foot in the door with Parsers/JavaParsers and...

A foot in the door with Parsers/JavaParsers and Scanners/JavaScanners.
Recently clued in as to how this situation came to be, I now know
there's no reason not to start containing the damage. Also more work
on names: made a general method for transforming Trees into type-named
Trees and put it to work. No review.

1 files changed, 11 insertions, 7 deletions

diff --git a/src/compiler/scala/tools/nsc/ast/TreeGen.scala b/src/compiler/scala/tools/nsc/ast/TreeGen.scala
index d93496a7c4..e606b1c6af 100644
--- a/src/compiler/scala/tools/nsc/ast/TreeGen.scala
+++ b/src/compiler/scala/tools/nsc/ast/TreeGen.scala
@@ -361,15 +361,19 @@ abstract class TreeGen {
     else
       mkCast(tree, pt)
 
+  /** Translate names in Select/Ident nodes to type names.
+   */
+  def convertToTypeName(tree: Tree): Option[RefTree] = tree match {
+    case Select(qual, name) => Some(Select(qual, name.toTypeName))
+    case Ident(name)        => Some(Ident(name.toTypeName))
+    case _                  => None
+  }
+
   /** Try to convert Select(qual, name) to a SelectFromTypeTree.
    */
-  def convertToSelectFromType(qual: Tree, origName: Name): Tree = {
-    def selFromType(qual1: Tree) = SelectFromTypeTree(qual1 setPos qual.pos, origName)
-    qual match {
-      case Select(qual1, name) => selFromType(Select(qual1, name.toTypeName))
-      case Ident(name)         => selFromType(Ident(name.toTypeName))
-      case _                   => EmptyTree
-    }
+  def convertToSelectFromType(qual: Tree, origName: Name) = convertToTypeName(qual) match {
+    case Some(qual1)  => SelectFromTypeTree(qual1 setPos qual.pos, origName)
+    case _            => EmptyTree
   }
 
   /** Used in situations where you need to access value of an expression several times