Merge pull request #4305 from dotty-staging/fix/file-positions

Fix files where the path does not match the package

Author: allanrenucci

compiler/src/dotty/tools/backend/jvm/CollectEntryPoints.scala

@@ -6,7 +6,6 @@ import dotty.tools.dotc.core.Types
 import dotty.tools.dotc.transform.MegaPhase._
 import dotty.tools.dotc.ast.tpd
 import dotty.tools.dotc
-import dotty.tools.dotc.backend.jvm.DottyPrimitives
 import dotty.tools.dotc.core.Flags.FlagSet
 import dotty.tools.dotc.transform.Erasure
 import dotty.tools.dotc.transform.SymUtils._

compiler/src/dotty/tools/backend/jvm/DottyBackendInterface.scala

@@ -3,7 +3,6 @@ package dotty.tools.backend.jvm
 import dotty.tools.dotc.ast.tpd
 import dotty.tools.dotc.ast.Trees
 import dotty.tools.dotc
-import dotty.tools.dotc.backend.jvm.DottyPrimitives
 import dotty.tools.dotc.core.Flags.FlagSet
 import dotty.tools.dotc.transform.{Erasure, GenericSignatures}
 import dotty.tools.dotc.transform.SymUtils._

compiler/src/dotty/tools/backend/jvm/GenBCode.scala

@@ -11,7 +11,6 @@ import scala.collection.JavaConverters._
 import scala.tools.asm.{ClassVisitor, CustomAttr, FieldVisitor, MethodVisitor}
 import scala.tools.nsc.backend.jvm._
 import dotty.tools.dotc
-import dotty.tools.dotc.backend.jvm.DottyPrimitives
 import dotty.tools.dotc.transform.Erasure
 import dotty.tools.dotc.transform.SymUtils._
 import dotty.tools.dotc.interfaces

compiler/src/dotty/tools/backend/jvm/scalaPrimitives.scala

@@ -3,21 +3,19 @@
  * @author  Martin Odersky
  */
 
-package dotty.tools.dotc
+package dotty.tools
 package backend.jvm
 
-import dotty.tools.backend.jvm.GenBCodePipeline
-import dotty.tools.dotc.ast.Trees.Select
-import dotty.tools.dotc.ast.tpd._
-import dotty.tools.dotc.core.Names.TermName
-import dotty.tools.dotc.core.StdNames
-import dotty.tools.dotc.core.StdNames._
-import dotty.tools.dotc.core.Types.{JavaArrayType, UnspecifiedErrorType, Type}
+import dotc.ast.Trees.Select
+import dotc.ast.tpd._
+import dotc.core._
+import Contexts.Context
+import Names.TermName, StdNames._
+import Types.{JavaArrayType, UnspecifiedErrorType, Type}
+import Symbols.{Symbol, NoSymbol}
 
 import scala.collection.{ mutable, immutable }
 
-import core.Contexts.Context
-import core.Symbols.{Symbol, NoSymbol}
 
 /** Scala primitive operations are represented as methods in `Any` and
  *  `AnyVal` subclasses. Here we demultiplex them by providing a mapping
@@ -127,8 +125,8 @@ class DottyPrimitives(ctx: Context) {
 
     implicit val ctx = this.ctx
 
-    import core.Symbols.defn
-    val primitives = core.Symbols.newMutableSymbolMap[Int]
+    import Symbols.defn
+    val primitives = Symbols.newMutableSymbolMap[Int]
 
     /** Add a primitive operation to the map */
     def addPrimitive(s: Symbol, code: Int): Unit = {
@@ -169,8 +167,6 @@ class DottyPrimitives(ctx: Context) {
     // java.lang.String
     addPrimitive(defn.String_+, CONCAT)
 
-    import core.StdNames.nme
-
     // scala.Array
     lazy val ArrayClass = defn.ArrayClass
     addPrimitives(ArrayClass, nme.length, LENGTH)