fixup imports

Author: lrytz

src/dotty/tools/dotc/backend/jvm/BCodeBodyBuilder.scala

@@ -440,7 +440,7 @@ abstract class BCodeBodyBuilder extends BCodeSkelBuilder {
           }
 
         case Literal(value) =>
-          import dotty.tools.dotc.core.Constants._
+          import core.Constants._
           if (value.tag != UnitTag) (value.tag, expectedType) match {
             case (IntTag,   LONG  ) => bc.lconst(value.longValue);       generatedType = LONG
             case (FloatTag, DOUBLE) => bc.dconst(value.doubleValue);     generatedType = DOUBLE
@@ -518,7 +518,7 @@ abstract class BCodeBodyBuilder extends BCodeSkelBuilder {
      */
     def genConstant(const: Constant): Unit = {
 
-      import dotty.tools.dotc.core.Constants._
+      import core.Constants._
 
       (const.tag: @switch) match {
 
@@ -913,7 +913,7 @@ abstract class BCodeBodyBuilder extends BCodeSkelBuilder {
     }
 
     /* Generate code that loads args into label parameters. */
-    def genLoadLabelArguments(args: List[Tree], lblDef: LabelDef, gotoPos: dotty.tools.dotc.util.Positions.Position): Unit = {
+    def genLoadLabelArguments(args: List[Tree], lblDef: LabelDef, gotoPos: util.Positions.Position): Unit = {
 
       val aps = {
         val params: List[Symbol] = lblDef.params.map(_.symbol)
@@ -1027,7 +1027,7 @@ abstract class BCodeBodyBuilder extends BCodeSkelBuilder {
     def genCallMethod(method:     Symbol,
                       style:      InvokeStyle,
                       hostClass0: Symbol = null,
-                      pos:        dotty.tools.dotc.util.Positions.Position = dotty.tools.dotc.util.Positions.NoPosition) {
+                      pos:        util.Positions.Position = util.Positions.NoPosition) {
 
       val siteSymbol = claszSymbol
       val hostSymbol = if (hostClass0 == null) method.owner else hostClass0;

src/dotty/tools/dotc/backend/jvm/BCodeGlue.scala

@@ -621,7 +621,9 @@ abstract class BCodeGlue {
    *
    * must-single-thread
    */
-  def brefType(iname: String): BType = { brefType(dotty.tools.dotc.core.Names.typeName(iname.toCharArray(), 0, iname.length())) }
+  def brefType(iname: String): BType = {
+    brefType(core.Names.typeName(iname.toCharArray(), 0, iname.length()))
+  }
 
   /*
    * Creates a BType token for the TypeName received as argument.

src/dotty/tools/dotc/backend/jvm/BCodeHelpers.scala

@@ -142,13 +142,13 @@ abstract class BCodeHelpers extends BCodeTypes with BytecodeWriters {
    */
   object isJavaEntryPoint {
 
-    import dotty.tools.dotc.core.Types.{MethodType, PolyType}
+    import core.Types.{MethodType, PolyType}
 
     /*
      * must-single-thread
      */
     def apply(sym: Symbol, ctx: Context): Boolean = {
-      def fail(msg: String, pos: dotty.tools.dotc.util.Positions.Position = sym.pos) = {
+      def fail(msg: String, pos: util.Positions.Position = sym.pos) = {
         ctx.warning(sym.pos,
           sym.name +
           s" has a main method with parameter type Array[String], but ${sym.fullName('.')} will not be a runnable program.\n  Reason: $msg"
@@ -512,7 +512,7 @@ abstract class BCodeHelpers extends BCodeTypes with BytecodeWriters {
         }
       }
 
-      import dotty.tools.dotc.core.Types.{ThisType, ConstantType, TypeRef, ClassInfo}
+      import core.Types.{ThisType, ConstantType, TypeRef, ClassInfo}
 
       // Call to .normalize fixes #3003 (follow type aliases). Otherwise, primitiveOrArrayOrRefType() would return ObjectReference.
       t match {
@@ -667,7 +667,7 @@ abstract class BCodeHelpers extends BCodeTypes with BytecodeWriters {
       (arg: @unchecked) match {
 
         case LiteralAnnotArg(const) =>
-          import dotty.tools.dotc.core.Constants._
+          import core.Constants._
           if (const.isNonUnitAnyVal) { av.visit(name, const.value) }
           else {
             (const.tag: @switch) match {

src/dotty/tools/dotc/backend/jvm/icodes.scala

@@ -150,7 +150,7 @@ object icodes {
     /** Call through super[mix].
      *  On JVM, translated to `invokespecial`.
      */
-    case class SuperCall(mix: dotty.tools.dotc.core.Names.TermName) extends InvokeStyle {
+    case class SuperCall(mix: core.Names.TermName) extends InvokeStyle {
       override def isSuper = true
       override def toString(): String = { "super(" + mix + ")" }
     }