NameTransformer.encode now goes from names to names.

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

3 files changed, 7 insertions, 10 deletions

diff --git a/src/dotty/tools/dotc/core/Decorators.scala b/src/dotty/tools/dotc/core/Decorators.scala
index 5e2da43e5..031974dfd 100644
--- a/src/dotty/tools/dotc/core/Decorators.scala
+++ b/src/dotty/tools/dotc/core/Decorators.scala
@@ -12,8 +12,6 @@ object Decorators {
   implicit class StringDecorator(val s: String) extends AnyVal with PreName {
     def toTypeName: TypeName = typeName(s)
     def toTermName: TermName = termName(s)
-    def toEncodedTypeName = encodedTypeName(s)
-    def toEncodedTermName = encodedTermName(s)
     def toText(printer: Printer): Text = Str(s)
   }
 
diff --git a/src/dotty/tools/dotc/core/Names.scala b/src/dotty/tools/dotc/core/Names.scala
index e5535cff3..8cc07d5b5 100644
--- a/src/dotty/tools/dotc/core/Names.scala
+++ b/src/dotty/tools/dotc/core/Names.scala
@@ -111,7 +111,8 @@ object Names {
       else this
 
     /** Replace operator symbols by corresponding \$op_name's. */
-    def encode: Name = fromString(NameTransformer.encode(toString))
+    def encode: Name =
+      if (this eq CONSTRUCTOR) this else NameTransformer.encode(this)
 
     /** A more efficient version of concatenation */
     def ++ (other: Name): ThisName = ++ (other.toString)
@@ -371,15 +372,9 @@ object Names {
   /** Create a term name from a string, without encoding operators */
   def termName(s: String): TermName = termName(s.toCharArray, 0, s.length)
 
-  /** Create a term name from a string, encode if necessary*/
-  def encodedTermName(s: String): TermName = termName(NameTransformer.encode(s))
-
   /** Create a type name from a string, wihtout encoding operators */
   def typeName(s: String): TypeName = typeName(s.toCharArray, 0, s.length)
 
-  /** Create a type name from a string, encode if necessary*/
-  def encodedTypeName(s: String): TypeName = typeName(NameTransformer.encode(s))
-
   /** The term name represented by the empoty string */
   val EmptyTermName = new TermName(-1, 0, null)
 
@@ -388,6 +383,9 @@ object Names {
   /** The type name represented by the empoty string */
   val EmptyTypeName = EmptyTermName.toTypeName
 
+  // can't use nme.CONSTRUCTOR in encode because of bootstrap failures.
+  private val CONSTRUCTOR = termName("<init>")
+
   def termNameBuilder: Builder[Char, TermName] =
     StringBuilder.newBuilder.mapResult(termName)
 
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 -----------------------