Rename nme.scala_ to nme.scala

Author: odersky

compiler/src/dotty/tools/dotc/core/Definitions.scala

@@ -116,7 +116,7 @@ class Definitions {
         val cls = denot.asClass.classSymbol
         val decls = newScope
         val arity = name.functionArity
-        val paramNamePrefix = tpnme.scala_ ++ str.NAME_JOIN ++ name ++ str.EXPAND_SEPARATOR
+        val paramNamePrefix = tpnme.scala ++ str.NAME_JOIN ++ name ++ str.EXPAND_SEPARATOR
         val argParamRefs = List.tabulate(arity) { i =>
           enterTypeParam(cls, paramNamePrefix ++ "T" ++ (i + 1).toString, Contravariant, decls).typeRef
         }
@@ -199,7 +199,7 @@ class Definitions {
   @tu lazy val OpsPackageVal: TermSymbol = ctx.newCompletePackageSymbol(RootClass, nme.OPS_PACKAGE).entered
   @tu lazy val OpsPackageClass: ClassSymbol = OpsPackageVal.moduleClass.asClass
 
-  @tu lazy val ScalaPackageVal: TermSymbol = ctx.requiredPackage(nme.scala_)
+  @tu lazy val ScalaPackageVal: TermSymbol = ctx.requiredPackage(nme.scala)
   @tu lazy val ScalaMathPackageVal: TermSymbol = ctx.requiredPackage("scala.math")
   @tu lazy val ScalaPackageClass: ClassSymbol = {
     val cls = ScalaPackageVal.moduleClass.asClass
@@ -1370,7 +1370,7 @@ class Definitions {
 
 //  /** The `Class[?]` of a primitive value type name */
 //  def valueTypeNameToJavaType(name: TypeName)(implicit ctx: Context): Option[Class[?]] =
-//    valueTypeNamesToJavaType.get(if (name.firstPart eq nme.scala_) name.lastPart.toTypeName else name)
+//    valueTypeNamesToJavaType.get(if (name.firstPart eq nme.scala) name.lastPart.toTypeName else name)
 
   type PrimitiveClassEnc = Int
 

compiler/src/dotty/tools/dotc/core/Denotations.scala

@@ -1356,7 +1356,7 @@ object Denotations {
         def isPackageFromCoreLibMissing: Boolean =
           owner.symbol == defn.RootClass &&
           (
-            selector == nme.scala_ || // if the scala package is missing, the stdlib must be missing
+            selector == nme.scala || // if the scala package is missing, the stdlib must be missing
             selector == nme.scalaShadowing // if the scalaShadowing package is missing, the dotty library must be missing
           )
         if (owner.exists) {

compiler/src/dotty/tools/dotc/core/StdNames.scala

@@ -156,8 +156,8 @@ object StdNames {
     final val Short: N   = "Short"
     final val Unit: N    = "Unit"
 
-    final val ScalaValueNames: scala.List[N] =
-      scala.List(Byte, Char, Short, Int, Long, Float, Double, Boolean, Unit)
+    final val ScalaValueNames: _root_.scala.List[N] =
+      _root_.scala.List(Byte, Char, Short, Int, Long, Float, Double, Boolean, Unit)
 
     // some types whose companions we utilize
     final val AnyRef: N     = "AnyRef"
@@ -562,7 +562,7 @@ object StdNames {
     val runtimeMirror: N        = "runtimeMirror"
     val s: N                    = "s"
     val sameElements: N         = "sameElements"
-    val scala_ : N              = "scala"
+    val scala : N               = "scala"
     val scalaShadowing : N      = "scalaShadowing"
     val selectDynamic: N        = "selectDynamic"
     val selectOverloadedMethod: N = "selectOverloadedMethod"

compiler/src/dotty/tools/dotc/parsing/Parsers.scala

@@ -149,7 +149,7 @@ object Parsers {
       ctx.error(msg, source.atSpan(span))
 
     def unimplementedExpr(implicit ctx: Context): Select =
-      Select(Select(rootDot(nme.scala_), nme.Predef), nme.???)
+      Select(Select(rootDot(nme.scala), nme.Predef), nme.???)
   }
 
   trait OutlineParserCommon extends ParserCommon {

compiler/src/dotty/tools/dotc/transform/PostTyper.scala

@@ -379,8 +379,8 @@ class PostTyper extends MacroTransform with IdentityDenotTransformer { thisPhase
       }
 
     /** Transforms the rhs tree into a its default tree if it is in an `erased` val/def.
-    *  Performed to shrink the tree that is known to be erased later.
-    */
+     *  Performed to shrink the tree that is known to be erased later.
+     */
     private def normalizeErasedRhs(rhs: Tree, sym: Symbol)(implicit ctx: Context) =
       if (sym.isEffectivelyErased) dropInlines.transform(rhs) else rhs
   }