diff --git a/src/dotty/tools/dotc/backend/jvm/BCodeBodyBuilder.scala b/src/dotty/tools/dotc/backend/jvm/BCodeBodyBuilder.scala index 72fe46a22231..16b0e2d93c69 100755 --- a/src/dotty/tools/dotc/backend/jvm/BCodeBodyBuilder.scala +++ b/src/dotty/tools/dotc/backend/jvm/BCodeBodyBuilder.scala @@ -12,7 +12,7 @@ package jvm import scala.collection.{ mutable, immutable } import scala.annotation.switch -import scala.tools.asm +import dotty.tools.asm import dotc.ast.Trees._ import core.Types.Type diff --git a/src/dotty/tools/dotc/backend/jvm/BCodeGlue.scala b/src/dotty/tools/dotc/backend/jvm/BCodeGlue.scala index 2e1102d2d307..f9386223fa9b 100755 --- a/src/dotty/tools/dotc/backend/jvm/BCodeGlue.scala +++ b/src/dotty/tools/dotc/backend/jvm/BCodeGlue.scala @@ -7,7 +7,7 @@ package dotty.tools package dotc package backend.jvm -import scala.tools.asm +import dotty.tools.asm import scala.annotation.switch import scala.collection.{ immutable, mutable } @@ -256,8 +256,8 @@ abstract class BCodeGlue { /* * can-multi-thread */ - def toASMType: scala.tools.asm.Type = { - import scala.tools.asm + def toASMType: dotty.tools.asm.Type = { + import dotty.tools.asm // using `asm.Type.SHORT` instead of `BType.SHORT` because otherwise "warning: could not emit switch for @switch annotated match" (sort: @switch) match { case asm.Type.VOID => asm.Type.VOID_TYPE @@ -533,7 +533,7 @@ abstract class BCodeGlue { * can-multi-thread */ def getOpcode(opcode: Int): Int = { - import scala.tools.asm.Opcodes + import dotty.tools.asm.Opcodes if (opcode == Opcodes.IALOAD || opcode == Opcodes.IASTORE) { // the offset for IALOAD or IASTORE is in byte 1 of 'off' for // primitive types (buf == null) diff --git a/src/dotty/tools/dotc/backend/jvm/BCodeHelpers.scala b/src/dotty/tools/dotc/backend/jvm/BCodeHelpers.scala index 8dc825ae62e4..76e8612a4891 100755 --- a/src/dotty/tools/dotc/backend/jvm/BCodeHelpers.scala +++ b/src/dotty/tools/dotc/backend/jvm/BCodeHelpers.scala @@ -7,7 +7,7 @@ package dotty.tools package dotc package backend.jvm -import scala.tools.asm +import dotty.tools.asm import scala.annotation.switch import scala.collection.{ immutable, mutable } import dotty.tools.io.AbstractFile @@ -823,7 +823,7 @@ abstract class BCodeHelpers extends BCodeTypes with BytecodeWriters { // Run the signature parser to catch bogus signatures. val isValidSignature = wrap { // Alternative: scala.tools.reflect.SigParser (frontend to sun.reflect.generics.parser.SignatureParser) - import scala.tools.asm.util.CheckClassAdapter + import dotty.tools.asm.util.CheckClassAdapter if (sym.isMethod) { CheckClassAdapter checkMethodSignature sig } else if (sym.isTerm) { CheckClassAdapter checkFieldSignature sig } else { CheckClassAdapter checkClassSignature sig } diff --git a/src/dotty/tools/dotc/backend/jvm/BCodeIdiomatic.scala b/src/dotty/tools/dotc/backend/jvm/BCodeIdiomatic.scala index 3e5c0d2ce169..b242a485c8a3 100755 --- a/src/dotty/tools/dotc/backend/jvm/BCodeIdiomatic.scala +++ b/src/dotty/tools/dotc/backend/jvm/BCodeIdiomatic.scala @@ -7,7 +7,7 @@ package dotty.tools package dotc package backend.jvm -import scala.tools.asm +import dotty.tools.asm import scala.annotation.switch import scala.collection.{ immutable, mutable } import collection.convert.Wrappers.JListWrapper diff --git a/src/dotty/tools/dotc/backend/jvm/BCodeSkelBuilder.scala b/src/dotty/tools/dotc/backend/jvm/BCodeSkelBuilder.scala index c0e04cc5e0b9..d0795eae3e70 100755 --- a/src/dotty/tools/dotc/backend/jvm/BCodeSkelBuilder.scala +++ b/src/dotty/tools/dotc/backend/jvm/BCodeSkelBuilder.scala @@ -13,7 +13,7 @@ import scala.collection.{ mutable, immutable } import scala.tools.nsc.symtab._ import scala.annotation.switch -import scala.tools.asm +import dotty.tools.asm import dotc.ast.Trees._ import dotc.core.Types.Type diff --git a/src/dotty/tools/dotc/backend/jvm/BCodeSyncAndTry.scala b/src/dotty/tools/dotc/backend/jvm/BCodeSyncAndTry.scala index 0b8ff7a578e0..700dac0673ba 100755 --- a/src/dotty/tools/dotc/backend/jvm/BCodeSyncAndTry.scala +++ b/src/dotty/tools/dotc/backend/jvm/BCodeSyncAndTry.scala @@ -12,7 +12,7 @@ package jvm import scala.collection.{ mutable, immutable } import scala.annotation.switch -import scala.tools.asm +import dotty.tools.asm import dotc.ast.Trees._ import dotc.core.Types.Type diff --git a/src/dotty/tools/dotc/backend/jvm/BCodeTypes.scala b/src/dotty/tools/dotc/backend/jvm/BCodeTypes.scala index dcca155b7e54..6abcf623f4f6 100755 --- a/src/dotty/tools/dotc/backend/jvm/BCodeTypes.scala +++ b/src/dotty/tools/dotc/backend/jvm/BCodeTypes.scala @@ -7,7 +7,7 @@ package dotty.tools package dotc package backend.jvm -import scala.tools.asm +import dotty.tools.asm import scala.collection.{ immutable, mutable } import dotc.ast.Trees.Tree diff --git a/src/dotty/tools/dotc/backend/jvm/BytecodeWriters.scala b/src/dotty/tools/dotc/backend/jvm/BytecodeWriters.scala index 6aea13233773..b414f6949509 100755 --- a/src/dotty/tools/dotc/backend/jvm/BytecodeWriters.scala +++ b/src/dotty/tools/dotc/backend/jvm/BytecodeWriters.scala @@ -85,7 +85,7 @@ trait BytecodeWriters { * * */ trait AsmpBytecodeWriter extends BytecodeWriter { - import scala.tools.asm + import dotty.tools.asm private val baseDir = Directory(settings.Ygenasmp.value).createDirectory() @@ -95,7 +95,7 @@ trait BytecodeWriters { val cnode = new asm.tree.ClassNode() val cr = new asm.ClassReader(jclassBytes) cr.accept(cnode, 0) - val trace = new scala.tools.asm.util.TraceClassVisitor(new java.io.PrintWriter(new java.io.StringWriter())) + val trace = new dotty.tools.asm.util.TraceClassVisitor(new java.io.PrintWriter(new java.io.StringWriter())) cnode.accept(trace) trace.p.print(pw) } diff --git a/src/dotty/tools/dotc/backend/jvm/GenBCode.scala b/src/dotty/tools/dotc/backend/jvm/GenBCode.scala index 572ac0ee0da0..d52abbc5c748 100755 --- a/src/dotty/tools/dotc/backend/jvm/GenBCode.scala +++ b/src/dotty/tools/dotc/backend/jvm/GenBCode.scala @@ -12,7 +12,7 @@ package jvm import scala.collection.{ mutable, immutable } import scala.annotation.switch -import scala.tools.asm +import dotty.tools.asm import dotc.ast.Trees import dotc.core.Types.Type diff --git a/src/dotty/tools/dotc/backend/jvm/icodes.scala b/src/dotty/tools/dotc/backend/jvm/icodes.scala index 8adb4e1aee4c..1bf364527118 100755 --- a/src/dotty/tools/dotc/backend/jvm/icodes.scala +++ b/src/dotty/tools/dotc/backend/jvm/icodes.scala @@ -32,48 +32,48 @@ object icodes { case object EQ extends TestOp { def negate() = NE override def toString() = "EQ" - override def opcodeIF() = scala.tools.asm.Opcodes.IFEQ - override def opcodeIFICMP() = scala.tools.asm.Opcodes.IF_ICMPEQ + override def opcodeIF() = dotty.tools.asm.Opcodes.IFEQ + override def opcodeIFICMP() = dotty.tools.asm.Opcodes.IF_ICMPEQ } /** A non-equality test */ case object NE extends TestOp { def negate() = EQ override def toString() = "NE" - override def opcodeIF() = scala.tools.asm.Opcodes.IFNE - override def opcodeIFICMP() = scala.tools.asm.Opcodes.IF_ICMPNE + override def opcodeIF() = dotty.tools.asm.Opcodes.IFNE + override def opcodeIFICMP() = dotty.tools.asm.Opcodes.IF_ICMPNE } /** A less-than test */ case object LT extends TestOp { def negate() = GE override def toString() = "LT" - override def opcodeIF() = scala.tools.asm.Opcodes.IFLT - override def opcodeIFICMP() = scala.tools.asm.Opcodes.IF_ICMPLT + override def opcodeIF() = dotty.tools.asm.Opcodes.IFLT + override def opcodeIFICMP() = dotty.tools.asm.Opcodes.IF_ICMPLT } /** A greater-than-or-equal test */ case object GE extends TestOp { def negate() = LT override def toString() = "GE" - override def opcodeIF() = scala.tools.asm.Opcodes.IFGE - override def opcodeIFICMP() = scala.tools.asm.Opcodes.IF_ICMPGE + override def opcodeIF() = dotty.tools.asm.Opcodes.IFGE + override def opcodeIFICMP() = dotty.tools.asm.Opcodes.IF_ICMPGE } /** A less-than-or-equal test */ case object LE extends TestOp { def negate() = GT override def toString() = "LE" - override def opcodeIF() = scala.tools.asm.Opcodes.IFLE - override def opcodeIFICMP() = scala.tools.asm.Opcodes.IF_ICMPLE + override def opcodeIF() = dotty.tools.asm.Opcodes.IFLE + override def opcodeIFICMP() = dotty.tools.asm.Opcodes.IF_ICMPLE } /** A greater-than test */ case object GT extends TestOp { def negate() = LE override def toString() = "GT" - override def opcodeIF() = scala.tools.asm.Opcodes.IFGT - override def opcodeIFICMP() = scala.tools.asm.Opcodes.IF_ICMPGT + override def opcodeIF() = dotty.tools.asm.Opcodes.IFGT + override def opcodeIFICMP() = dotty.tools.asm.Opcodes.IF_ICMPGT } /** This class represents an arithmetic operation. */