Move backend from scala.tools.nsc to dotty.tools

OlivierBlanvillain · OlivierBlanvillain · commit ff15f0445b91 · 2019-02-08T01:05:34.000+01:00
diff --git a/compiler/src/dotty/tools/backend/ScalaPrimitivesOps.scala b/compiler/src/dotty/tools/backend/ScalaPrimitivesOps.scala
@@ -1,10 +1,4 @@
-/* NSC -- new Scala compiler
- * Copyright 2005-2013 LAMP/EPFL
- * @author  Martin Odersky
- */
-
-package scala
-package tools.nsc
+package dotty.tools
 package backend
 
 object ScalaPrimitivesOps extends ScalaPrimitivesOps
diff --git a/compiler/src/dotty/tools/backend/WorklistAlgorithm.scala b/compiler/src/dotty/tools/backend/WorklistAlgorithm.scala
@@ -1,9 +1,4 @@
-/* NSC -- new Scala compiler
- * Copyright 2005-2013 LAMP/EPFL
- * @author  Martin Odersky
- */
-
-package scala.tools.nsc
+package dotty.tools
 package backend
 
 import scala.collection.mutable
diff --git a/compiler/src/dotty/tools/backend/jvm/AsmUtils.scala b/compiler/src/dotty/tools/backend/jvm/AsmUtils.scala
@@ -1,9 +1,6 @@
-/* NSC -- new Scala compiler
- * Copyright 2005-2014 LAMP/EPFL
- * @author  Martin Odersky
- */
-
-package scala.tools.nsc.backend.jvm
+package dotty.tools
+package backend
+package jvm
 
 import scala.tools.asm.tree.{AbstractInsnNode, ClassNode, MethodNode}
 import java.io.PrintWriter
diff --git a/compiler/src/dotty/tools/backend/jvm/BCodeAsmCommon.scala b/compiler/src/dotty/tools/backend/jvm/BCodeAsmCommon.scala
@@ -1,9 +1,6 @@
-/* NSC -- new Scala compiler
- * Copyright 2005-2014 LAMP/EPFL
- * @author  Martin Odersky
- */
-
-package scala.tools.nsc.backend.jvm
+package dotty.tools
+package backend
+package jvm
 
 /**
  * This trait contains code shared between GenBCode and GenASM that depends on types defined in
diff --git a/compiler/src/dotty/tools/backend/jvm/BCodeBodyBuilder.scala b/compiler/src/dotty/tools/backend/jvm/BCodeBodyBuilder.scala
@@ -1,19 +1,12 @@
-/* NSC -- new Scala compiler
- * Copyright 2005-2012 LAMP/EPFL
- * @author  Martin Odersky
- */
-
-
-package scala
-package tools.nsc
+package dotty.tools
 package backend
 package jvm
 
 import scala.annotation.switch
 
 import scala.tools.asm
 import scala.tools.asm.{Handle, Label, Opcodes}
-import scala.tools.nsc.backend.jvm.BCodeHelpers.InvokeStyle
+import BCodeHelpers.InvokeStyle
 
 /*
  *
diff --git a/compiler/src/dotty/tools/backend/jvm/BCodeHelpers.scala b/compiler/src/dotty/tools/backend/jvm/BCodeHelpers.scala
@@ -1,11 +1,6 @@
-/* NSC -- new Scala compiler
- * Copyright 2005-2012 LAMP/EPFL
- * @author  Martin Odersky
- */
-
-package scala
-package tools.nsc
-package backend.jvm
+package dotty.tools
+package backend
+package jvm
 
 import scala.tools.asm
 import scala.collection.mutable
diff --git a/compiler/src/dotty/tools/backend/jvm/BCodeIdiomatic.scala b/compiler/src/dotty/tools/backend/jvm/BCodeIdiomatic.scala
@@ -1,16 +1,10 @@
-/* NSC -- new Scala compiler
- * Copyright 2005-2012 LAMP/EPFL
- * @author  Martin Odersky
- */
-
-package scala
-package tools.nsc
-package backend.jvm
+package dotty.tools
+package backend
+package jvm
 
 import scala.tools.asm
 import scala.annotation.switch
 import scala.collection.mutable
-import scala.tools.nsc.backend.ScalaPrimitivesOps
 import Primitives.{NE, EQ, TestOp, ArithmeticOp}
 
 /*
diff --git a/compiler/src/dotty/tools/backend/jvm/BCodeSkelBuilder.scala b/compiler/src/dotty/tools/backend/jvm/BCodeSkelBuilder.scala
@@ -1,11 +1,4 @@
-/* NSC -- new Scala compiler
- * Copyright 2005-2012 LAMP/EPFL
- * @author  Martin Odersky
- */
-
-
-package scala
-package tools.nsc
+package dotty.tools
 package backend
 package jvm
 
diff --git a/compiler/src/dotty/tools/backend/jvm/BCodeSyncAndTry.scala b/compiler/src/dotty/tools/backend/jvm/BCodeSyncAndTry.scala
@@ -1,11 +1,4 @@
-/* NSC -- new Scala compiler
- * Copyright 2005-2012 LAMP/EPFL
- * @author  Martin Odersky
- */
-
-
-package scala
-package tools.nsc
+package dotty.tools
 package backend
 package jvm
 
diff --git a/compiler/src/dotty/tools/backend/jvm/BTypes.scala b/compiler/src/dotty/tools/backend/jvm/BTypes.scala
@@ -1,10 +1,6 @@
-/* NSC -- new Scala compiler
- * Copyright 2005-2014 LAMP/EPFL
- * @author  Martin Odersky
- */
-
-package scala.tools.nsc
-package backend.jvm
+package dotty.tools
+package backend
+package jvm
 
 import scala.tools.asm
 
diff --git a/compiler/src/dotty/tools/backend/jvm/BTypesFromSymbols.scala b/compiler/src/dotty/tools/backend/jvm/BTypesFromSymbols.scala
@@ -1,10 +1,6 @@
-/* NSC -- new Scala compiler
- * Copyright 2005-2014 LAMP/EPFL
- * @author  Martin Odersky
- */
-
-package scala.tools.nsc
-package backend.jvm
+package dotty.tools
+package backend
+package jvm
 
 import scala.tools.asm
 
diff --git a/compiler/src/dotty/tools/backend/jvm/BackendInterface.scala b/compiler/src/dotty/tools/backend/jvm/BackendInterface.scala
@@ -1,4 +1,6 @@
-package scala.tools.nsc.backend.jvm
+package dotty.tools
+package backend
+package jvm
 
 import scala.collection.generic.Clearable
 import scala.reflect.ClassTag
diff --git a/compiler/src/dotty/tools/backend/jvm/BytecodeWriters.scala b/compiler/src/dotty/tools/backend/jvm/BytecodeWriters.scala
@@ -1,10 +1,6 @@
-/* NSC -- new Scala compiler
- * Copyright 2005-2013 LAMP/EPFL
- * @author  Martin Odersky
- */
-
-package scala.tools.nsc
-package backend.jvm
+package dotty.tools
+package backend
+package jvm
 
 import java.io.{ DataOutputStream, FileOutputStream, IOException, OutputStream, File => JFile }
 import dotty.tools.io._
diff --git a/compiler/src/dotty/tools/backend/jvm/CoreBTypes.scala b/compiler/src/dotty/tools/backend/jvm/CoreBTypes.scala
@@ -1,5 +1,6 @@
-package scala.tools.nsc
-package backend.jvm
+package dotty.tools
+package backend
+package jvm
 
 import scala.annotation.switch
 
@@ -166,7 +167,7 @@ class CoreBTypes[BTFS <: BTypesFromSymbols[_ <: BackendInterface]](val bTypes: B
   )
 
   lazy val typeOfArrayOp: Map[Int, BType] = {
-    import scala.tools.nsc.backend.ScalaPrimitivesOps._
+    import dotty.tools.backend.ScalaPrimitivesOps._
     Map(
         (List(ZARRAY_LENGTH, ZARRAY_GET, ZARRAY_SET) map (_ -> BOOL))   ++
         (List(BARRAY_LENGTH, BARRAY_GET, BARRAY_SET) map (_ -> BYTE))   ++
diff --git a/compiler/src/dotty/tools/backend/jvm/DottyBackendInterface.scala b/compiler/src/dotty/tools/backend/jvm/DottyBackendInterface.scala
@@ -14,7 +14,6 @@ import scala.reflect.ClassTag
 import dotty.tools.dotc.util.WeakHashSet
 import dotty.tools.io.AbstractFile
 import scala.tools.asm.AnnotationVisitor
-import scala.tools.nsc.backend.jvm.{BCodeHelpers, BackendInterface}
 import dotty.tools.dotc.core._
 import Contexts._
 import Types._
diff --git a/compiler/src/dotty/tools/backend/jvm/GenBCode.scala b/compiler/src/dotty/tools/backend/jvm/GenBCode.scala
@@ -8,7 +8,6 @@ import dotty.tools.dotc.core.Phases.Phase
 import scala.collection.mutable
 import scala.collection.JavaConverters._
 import scala.tools.asm.CustomAttr
-import scala.tools.nsc.backend.jvm._
 import dotty.tools.dotc.transform.SymUtils._
 import dotty.tools.dotc.interfaces
 import dotty.tools.dotc.util.SourceFile
diff --git a/compiler/src/dotty/tools/backend/jvm/GenBCodeOps.scala b/compiler/src/dotty/tools/backend/jvm/GenBCodeOps.scala
@@ -1,11 +1,4 @@
-/* NSC -- new Scala compiler
- * Copyright 2005-2012 LAMP/EPFL
- * @author  Martin Odersky
- */
-
-
-package scala
-package tools.nsc
+package dotty.tools
 package backend
 package jvm
 
diff --git a/compiler/src/dotty/tools/backend/jvm/Primitives.scala b/compiler/src/dotty/tools/backend/jvm/Primitives.scala
@@ -1,10 +1,4 @@
-/* NSC -- new scala compiler
- * Copyright 2005-2013 LAMP/EPFL
- * @author  Martin Odersky
- */
-
-
-package scala.tools.nsc
+package dotty.tools
 package backend
 package jvm
 
diff --git a/compiler/src/dotty/tools/backend/jvm/scalaPrimitives.scala b/compiler/src/dotty/tools/backend/jvm/scalaPrimitives.scala
@@ -35,7 +35,7 @@ import scala.collection.immutable
  * Inspired from the `scalac` compiler.
  */
 class DottyPrimitives(ctx: Context) {
-  import scala.tools.nsc.backend.ScalaPrimitivesOps._
+  import dotty.tools.backend.ScalaPrimitivesOps._
 
   private lazy val primitives: immutable.Map[Symbol, Int] = init
 
diff --git a/compiler/src/dotty/tools/backend/sjs/JSCodeGen.scala b/compiler/src/dotty/tools/backend/sjs/JSCodeGen.scala
@@ -1036,7 +1036,7 @@ class JSCodeGen()(implicit ctx: Context) {
 
   /** Gen JS code for a primitive method call. */
   private def genPrimitiveOp(tree: Apply, isStat: Boolean): js.Tree = {
-    import scala.tools.nsc.backend.ScalaPrimitivesOps._
+    import dotty.tools.backend.ScalaPrimitivesOps._
 
     implicit val pos = tree.span
 
@@ -1076,7 +1076,7 @@ class JSCodeGen()(implicit ctx: Context) {
 
   /** Gen JS code for a simple unary operation. */
   private def genSimpleUnaryOp(tree: Apply, arg: Tree, code: Int): js.Tree = {
-    import scala.tools.nsc.backend.ScalaPrimitivesOps._
+    import dotty.tools.backend.ScalaPrimitivesOps._
 
     implicit val pos = tree.span
 
@@ -1117,7 +1117,7 @@ class JSCodeGen()(implicit ctx: Context) {
 
   /** Gen JS code for a simple binary operation. */
   private def genSimpleBinaryOp(tree: Apply, lhs: Tree, rhs: Tree, code: Int): js.Tree = {
-    import scala.tools.nsc.backend.ScalaPrimitivesOps._
+    import dotty.tools.backend.ScalaPrimitivesOps._
     import js.UnaryOp._
 
     implicit val pos = tree.span
@@ -1332,7 +1332,7 @@ class JSCodeGen()(implicit ctx: Context) {
   private def genUniversalEqualityOp(ltpe: Type, rtpe: Type, lhs: js.Tree, rhs: js.Tree, code: Int)(
       implicit pos: Position): js.Tree = {
 
-    import scala.tools.nsc.backend.ScalaPrimitivesOps._
+    import dotty.tools.backend.ScalaPrimitivesOps._
 
     val bypassEqEq = {
       // Do not call equals if we have a literal null at either side.
@@ -1458,7 +1458,7 @@ class JSCodeGen()(implicit ctx: Context) {
 
   /** Gen JS code for an array operation (get, set or length) */
   private def genArrayOp(tree: Tree, code: Int): js.Tree = {
-    import scala.tools.nsc.backend.ScalaPrimitivesOps._
+    import dotty.tools.backend.ScalaPrimitivesOps._
 
     implicit val pos = tree.span
 
diff --git a/compiler/src/dotty/tools/backend/sjs/JSPrimitives.scala b/compiler/src/dotty/tools/backend/sjs/JSPrimitives.scala
@@ -45,7 +45,7 @@ object JSPrimitives {
 
 class JSPrimitives(ctx: Context) extends DottyPrimitives(ctx) {
   import JSPrimitives._
-  import scala.tools.nsc.backend.ScalaPrimitivesOps._
+  import dotty.tools.backend.ScalaPrimitivesOps._
 
   private lazy val jsPrimitives: Map[Symbol, Int] = initJSPrimitives(ctx)
 
diff --git a/compiler/test/dotty/tools/dotc/CompilationTests.scala b/compiler/test/dotty/tools/dotc/CompilationTests.scala
@@ -258,8 +258,8 @@ class CompilationTests extends ParallelTesting {
         compileShallowFilesInDir("compiler/src/dotty/tools/dotc/transform", opt) +
         compileShallowFilesInDir("compiler/src/dotty/tools/dotc/typer", opt) +
         compileShallowFilesInDir("compiler/src/dotty/tools/dotc/util", opt) +
-        compileShallowFilesInDir("compiler/src/scala/tools/nsc/backend", opt) +
-        compileShallowFilesInDir("compiler/src/scala/tools/nsc/backend/jvm", opt) +
+        compileShallowFilesInDir("compiler/src/dotty/tools/backend", opt) +
+        compileShallowFilesInDir("compiler/src/dotty/tools/backend/jvm", opt) +
         compileList("shallow-scalajs-ir", scalaJSIRSources, opt)
       }.keepOutput :: Nil
     }.map(_.checkCompile())
