Moved NameTransformer from the compiler to the ...

Moved NameTransformer from the compiler to the library because I need
access to the logic for reflection.

7 files changed, 11 insertions, 8 deletions

diff --git a/src/compiler/scala/tools/nsc/Interpreter.scala b/src/compiler/scala/tools/nsc/Interpreter.scala
index 6173753c6d..1beeeb2529 100644
--- a/src/compiler/scala/tools/nsc/Interpreter.scala
+++ b/src/compiler/scala/tools/nsc/Interpreter.scala
@@ -21,7 +21,8 @@ import scala.util.control.Exception.{ Catcher, catching, ultimately, unwrapping
 import io.{ PlainFile, VirtualDirectory }
 import reporters.{ ConsoleReporter, Reporter }
 import symtab.{ Flags, Names }
-import util.{ SourceFile, BatchSourceFile, ClassPath, NameTransformer }
+import util.{ SourceFile, BatchSourceFile, ClassPath }
+import scala.util.NameTransformer
 import nsc.{ InterpreterResults => IR }
 import nsc.interpreter._
 import Interpreter._
@@ -857,7 +858,7 @@ class Interpreter(val settings: Settings, out: PrintWriter)
    */
   def membersOfIdentifier(line: String): List[String] = {
     import Completion.{ isValidCompletion }
-    import scala.tools.nsc.util.NameTransformer.{ decode, encode }   // e.g. $plus$plus => ++
+    import NameTransformer.{ decode, encode }   // e.g. $plus$plus => ++
 
     val res = beQuietDuring {
       for (name <- nameOfIdent(line) ; req <- requestForName(name)) yield {
diff --git a/src/compiler/scala/tools/nsc/doc/ModelFrames.scala b/src/compiler/scala/tools/nsc/doc/ModelFrames.scala
index 5bda711f12..1f0453db6e 100644
--- a/src/compiler/scala/tools/nsc/doc/ModelFrames.scala
+++ b/src/compiler/scala/tools/nsc/doc/ModelFrames.scala
@@ -7,7 +7,7 @@
 package scala.tools.nsc.doc
 
 import java.io.{File, FileWriter}
-import util.NameTransformer
+import scala.util.NameTransformer
 import scala.collection.mutable
 import scala.compat.Platform.{EOL => LINE_SEPARATOR}
 import scala.xml.{NodeSeq, Text, Unparsed, Utility}
diff --git a/src/compiler/scala/tools/nsc/models/SemanticTokens.scala b/src/compiler/scala/tools/nsc/models/SemanticTokens.scala
index 56e80cf5bf..58d69b9628 100644
--- a/src/compiler/scala/tools/nsc/models/SemanticTokens.scala
+++ b/src/compiler/scala/tools/nsc/models/SemanticTokens.scala
@@ -13,7 +13,8 @@ import scala.collection.mutable.{HashMap, HashSet}
 import scala.tools.nsc.Global
 import scala.tools.nsc.symtab.{Flags, Names}
 import scala.tools.nsc.symtab.Flags.DEFERRED
-import scala.tools.nsc.util.{BatchSourceFile, NameTransformer, NoPosition, Position, SourceFile}
+import scala.tools.nsc.util.{BatchSourceFile, NoPosition, Position, SourceFile}
+import scala.util.NameTransformer
 
 class SemanticTokens(val compiler: Global) {
   import compiler._
diff --git a/src/compiler/scala/tools/nsc/models/Signatures.scala b/src/compiler/scala/tools/nsc/models/Signatures.scala
index a6e7391f2c..05fffe58e1 100644
--- a/src/compiler/scala/tools/nsc/models/Signatures.scala
+++ b/src/compiler/scala/tools/nsc/models/Signatures.scala
@@ -9,7 +9,8 @@ package scala.tools.nsc.models
 import scala.collection.mutable.{HashMap, HashSet}
 import scala.tools.nsc.{Global => Compiler}
 import scala.tools.nsc.symtab.{Flags, Names}
-import scala.tools.nsc.util.{NameTransformer, Position, SourceFile}
+import scala.tools.nsc.util.{ Position, SourceFile }
+import scala.util.NameTransformer
 
 /** This class ...
  *
diff --git a/src/compiler/scala/tools/nsc/symtab/Names.scala b/src/compiler/scala/tools/nsc/symtab/Names.scala
index 492198e081..70612c2a85 100644
--- a/src/compiler/scala/tools/nsc/symtab/Names.scala
+++ b/src/compiler/scala/tools/nsc/symtab/Names.scala
@@ -6,7 +6,7 @@
 
 package scala.tools.nsc.symtab
 
-import scala.tools.nsc.util.NameTransformer
+import scala.util.NameTransformer
 import scala.io.UTF8Codec
 import java.security.MessageDigest
 
diff --git a/src/compiler/scala/tools/nsc/symtab/StdNames.scala b/src/compiler/scala/tools/nsc/symtab/StdNames.scala
index b97f55f9b3..ae2f3a39c7 100644
--- a/src/compiler/scala/tools/nsc/symtab/StdNames.scala
+++ b/src/compiler/scala/tools/nsc/symtab/StdNames.scala
@@ -6,7 +6,7 @@
 
 package scala.tools.nsc.symtab
 
-import scala.tools.nsc.util.NameTransformer
+import scala.util.NameTransformer
 
 trait StdNames {
   self: SymbolTable =>
diff --git a/src/compiler/scala/tools/nsc/util/NameTransformer.scala b/src/library/scala/util/NameTransformer.scala
index 0292e1c68a..9472413ca2 100644
--- a/src/compiler/scala/tools/nsc/util/NameTransformer.scala
+++ b/src/library/scala/util/NameTransformer.scala
@@ -4,7 +4,7 @@
  */
 // $Id$
 
-package scala.tools.nsc.util
+package scala.util
 
 object NameTransformer {
   private val nops = 128