NameTransformer.encode now goes from names to names.

Also, special treatment of <init>, which is not encoded.

1 files changed, 2 insertions, 1 deletions

diff --git a/src/dotty/tools/dotc/core/StdNames.scala b/src/dotty/tools/dotc/core/StdNames.scala
index ea671ed8a..ada74c69d 100644
--- a/src/dotty/tools/dotc/core/StdNames.scala
+++ b/src/dotty/tools/dotc/core/StdNames.scala
@@ -17,6 +17,7 @@ object StdNames {
 
   abstract class DefinedNames[N <: Name] {
     protected implicit def fromString(s: String): N
+    protected def fromName(name: Name): N = fromString(name.toString)
 
     private val kws = mutable.Set[N]()
     protected def kw(name: N) = { kws += name; name }
@@ -25,7 +26,7 @@ object StdNames {
   }
 
   abstract class ScalaNames[N <: Name] extends DefinedNames[N] {
-    private def encode(s: String): N = fromString(NameTransformer.encode(s))
+    private def encode(s: String): N = fromName(fromString(s).encode)
 
 // Keywords, need to come first -----------------------