Skip to content

Commit ff15f04

Browse files
OlivierBlanvillainOlivierBlanvillain
committed
Move backend from scala.tools.nsc to dotty.tools
1 parent 06a77e7 commit ff15f04

22 files changed

+45
-118
lines changed

‎compiler/src/scala/tools/nsc/backend/ScalaPrimitivesOps.scala renamed to ‎compiler/src/dotty/tools/backend/ScalaPrimitivesOps.scala

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,4 @@
1-
/* NSC -- new Scala compiler
2-
* Copyright 2005-2013 LAMP/EPFL
3-
* @author Martin Odersky
4-
*/
5-
6-
package scala
7-
package tools.nsc
1+
package dotty.tools
82
package backend
93

104
object ScalaPrimitivesOps extends ScalaPrimitivesOps

‎compiler/src/scala/tools/nsc/backend/WorklistAlgorithm.scala renamed to ‎compiler/src/dotty/tools/backend/WorklistAlgorithm.scala

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
1-
/* NSC -- new Scala compiler
2-
* Copyright 2005-2013 LAMP/EPFL
3-
* @author Martin Odersky
4-
*/
5-
6-
package scala.tools.nsc
1+
package dotty.tools
72
package backend
83

94
import scala.collection.mutable

‎compiler/src/scala/tools/nsc/backend/jvm/AsmUtils.scala renamed to ‎compiler/src/dotty/tools/backend/jvm/AsmUtils.scala

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
1-
/* NSC -- new Scala compiler
2-
* Copyright 2005-2014 LAMP/EPFL
3-
* @author Martin Odersky
4-
*/
5-
6-
package scala.tools.nsc.backend.jvm
1+
package dotty.tools
2+
package backend
3+
package jvm
74

85
import scala.tools.asm.tree.{AbstractInsnNode, ClassNode, MethodNode}
96
import java.io.PrintWriter

‎compiler/src/scala/tools/nsc/backend/jvm/BCodeAsmCommon.scala renamed to ‎compiler/src/dotty/tools/backend/jvm/BCodeAsmCommon.scala

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
1-
/* NSC -- new Scala compiler
2-
* Copyright 2005-2014 LAMP/EPFL
3-
* @author Martin Odersky
4-
*/
5-
6-
package scala.tools.nsc.backend.jvm
1+
package dotty.tools
2+
package backend
3+
package jvm
74

85
/**
96
* This trait contains code shared between GenBCode and GenASM that depends on types defined in

‎compiler/src/scala/tools/nsc/backend/jvm/BCodeBodyBuilder.scala renamed to ‎compiler/src/dotty/tools/backend/jvm/BCodeBodyBuilder.scala

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,12 @@
1-
/* NSC -- new Scala compiler
2-
* Copyright 2005-2012 LAMP/EPFL
3-
* @author Martin Odersky
4-
*/
5-
6-
7-
package scala
8-
package tools.nsc
1+
package dotty.tools
92
package backend
103
package jvm
114

125
import scala.annotation.switch
136

147
import scala.tools.asm
158
import scala.tools.asm.{Handle, Label, Opcodes}
16-
import scala.tools.nsc.backend.jvm.BCodeHelpers.InvokeStyle
9+
import BCodeHelpers.InvokeStyle
1710

1811
/*
1912
*

‎compiler/src/scala/tools/nsc/backend/jvm/BCodeHelpers.scala renamed to ‎compiler/src/dotty/tools/backend/jvm/BCodeHelpers.scala

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
1-
/* NSC -- new Scala compiler
2-
* Copyright 2005-2012 LAMP/EPFL
3-
* @author Martin Odersky
4-
*/
5-
6-
package scala
7-
package tools.nsc
8-
package backend.jvm
1+
package dotty.tools
2+
package backend
3+
package jvm
94

105
import scala.tools.asm
116
import scala.collection.mutable

‎compiler/src/scala/tools/nsc/backend/jvm/BCodeIdiomatic.scala renamed to ‎compiler/src/dotty/tools/backend/jvm/BCodeIdiomatic.scala

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,10 @@
1-
/* NSC -- new Scala compiler
2-
* Copyright 2005-2012 LAMP/EPFL
3-
* @author Martin Odersky
4-
*/
5-
6-
package scala
7-
package tools.nsc
8-
package backend.jvm
1+
package dotty.tools
2+
package backend
3+
package jvm
94

105
import scala.tools.asm
116
import scala.annotation.switch
127
import scala.collection.mutable
13-
import scala.tools.nsc.backend.ScalaPrimitivesOps
148
import Primitives.{NE, EQ, TestOp, ArithmeticOp}
159

1610
/*

‎compiler/src/scala/tools/nsc/backend/jvm/BCodeSkelBuilder.scala renamed to ‎compiler/src/dotty/tools/backend/jvm/BCodeSkelBuilder.scala

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,4 @@
1-
/* NSC -- new Scala compiler
2-
* Copyright 2005-2012 LAMP/EPFL
3-
* @author Martin Odersky
4-
*/
5-
6-
7-
package scala
8-
package tools.nsc
1+
package dotty.tools
92
package backend
103
package jvm
114

‎compiler/src/scala/tools/nsc/backend/jvm/BCodeSyncAndTry.scala renamed to ‎compiler/src/dotty/tools/backend/jvm/BCodeSyncAndTry.scala

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,4 @@
1-
/* NSC -- new Scala compiler
2-
* Copyright 2005-2012 LAMP/EPFL
3-
* @author Martin Odersky
4-
*/
5-
6-
7-
package scala
8-
package tools.nsc
1+
package dotty.tools
92
package backend
103
package jvm
114

‎compiler/src/scala/tools/nsc/backend/jvm/BTypes.scala renamed to ‎compiler/src/dotty/tools/backend/jvm/BTypes.scala

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
1-
/* NSC -- new Scala compiler
2-
* Copyright 2005-2014 LAMP/EPFL
3-
* @author Martin Odersky
4-
*/
5-
6-
package scala.tools.nsc
7-
package backend.jvm
1+
package dotty.tools
2+
package backend
3+
package jvm
84

95
import scala.tools.asm
106

‎compiler/src/scala/tools/nsc/backend/jvm/BTypesFromSymbols.scala renamed to ‎compiler/src/dotty/tools/backend/jvm/BTypesFromSymbols.scala

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
1-
/* NSC -- new Scala compiler
2-
* Copyright 2005-2014 LAMP/EPFL
3-
* @author Martin Odersky
4-
*/
5-
6-
package scala.tools.nsc
7-
package backend.jvm
1+
package dotty.tools
2+
package backend
3+
package jvm
84

95
import scala.tools.asm
106

‎compiler/src/scala/tools/nsc/backend/jvm/BackendInterface.scala renamed to ‎compiler/src/dotty/tools/backend/jvm/BackendInterface.scala

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
package scala.tools.nsc.backend.jvm
1+
package dotty.tools
2+
package backend
3+
package jvm
24

35
import scala.collection.generic.Clearable
46
import scala.reflect.ClassTag

‎compiler/src/scala/tools/nsc/backend/jvm/BytecodeWriters.scala renamed to ‎compiler/src/dotty/tools/backend/jvm/BytecodeWriters.scala

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
1-
/* NSC -- new Scala compiler
2-
* Copyright 2005-2013 LAMP/EPFL
3-
* @author Martin Odersky
4-
*/
5-
6-
package scala.tools.nsc
7-
package backend.jvm
1+
package dotty.tools
2+
package backend
3+
package jvm
84

95
import java.io.{ DataOutputStream, FileOutputStream, IOException, OutputStream, File => JFile }
106
import dotty.tools.io._

‎compiler/src/scala/tools/nsc/backend/jvm/CoreBTypes.scala renamed to ‎compiler/src/dotty/tools/backend/jvm/CoreBTypes.scala

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
package scala.tools.nsc
2-
package backend.jvm
1+
package dotty.tools
2+
package backend
3+
package jvm
34

45
import scala.annotation.switch
56

@@ -166,7 +167,7 @@ class CoreBTypes[BTFS <: BTypesFromSymbols[_ <: BackendInterface]](val bTypes: B
166167
)
167168

168169
lazy val typeOfArrayOp: Map[Int, BType] = {
169-
import scala.tools.nsc.backend.ScalaPrimitivesOps._
170+
import dotty.tools.backend.ScalaPrimitivesOps._
170171
Map(
171172
(List(ZARRAY_LENGTH, ZARRAY_GET, ZARRAY_SET) map (_ -> BOOL)) ++
172173
(List(BARRAY_LENGTH, BARRAY_GET, BARRAY_SET) map (_ -> BYTE)) ++

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import scala.reflect.ClassTag
1414
import dotty.tools.dotc.util.WeakHashSet
1515
import dotty.tools.io.AbstractFile
1616
import scala.tools.asm.AnnotationVisitor
17-
import scala.tools.nsc.backend.jvm.{BCodeHelpers, BackendInterface}
1817
import dotty.tools.dotc.core._
1918
import Contexts._
2019
import Types._

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import dotty.tools.dotc.core.Phases.Phase
88
import scala.collection.mutable
99
import scala.collection.JavaConverters._
1010
import scala.tools.asm.CustomAttr
11-
import scala.tools.nsc.backend.jvm._
1211
import dotty.tools.dotc.transform.SymUtils._
1312
import dotty.tools.dotc.interfaces
1413
import dotty.tools.dotc.util.SourceFile

‎compiler/src/scala/tools/nsc/backend/jvm/GenBCodeOps.scala renamed to ‎compiler/src/dotty/tools/backend/jvm/GenBCodeOps.scala

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,4 @@
1-
/* NSC -- new Scala compiler
2-
* Copyright 2005-2012 LAMP/EPFL
3-
* @author Martin Odersky
4-
*/
5-
6-
7-
package scala
8-
package tools.nsc
1+
package dotty.tools
92
package backend
103
package jvm
114

‎compiler/src/scala/tools/nsc/backend/jvm/Primitives.scala renamed to ‎compiler/src/dotty/tools/backend/jvm/Primitives.scala

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,4 @@
1-
/* NSC -- new scala compiler
2-
* Copyright 2005-2013 LAMP/EPFL
3-
* @author Martin Odersky
4-
*/
5-
6-
7-
package scala.tools.nsc
1+
package dotty.tools
82
package backend
93
package jvm
104

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import scala.collection.immutable
3535
* Inspired from the `scalac` compiler.
3636
*/
3737
class DottyPrimitives(ctx: Context) {
38-
import scala.tools.nsc.backend.ScalaPrimitivesOps._
38+
import dotty.tools.backend.ScalaPrimitivesOps._
3939

4040
private lazy val primitives: immutable.Map[Symbol, Int] = init
4141

‎compiler/src/dotty/tools/backend/sjs/JSCodeGen.scala

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1036,7 +1036,7 @@ class JSCodeGen()(implicit ctx: Context) {
10361036

10371037
/** Gen JS code for a primitive method call. */
10381038
private def genPrimitiveOp(tree: Apply, isStat: Boolean): js.Tree = {
1039-
import scala.tools.nsc.backend.ScalaPrimitivesOps._
1039+
import dotty.tools.backend.ScalaPrimitivesOps._
10401040

10411041
implicit val pos = tree.span
10421042

@@ -1076,7 +1076,7 @@ class JSCodeGen()(implicit ctx: Context) {
10761076

10771077
/** Gen JS code for a simple unary operation. */
10781078
private def genSimpleUnaryOp(tree: Apply, arg: Tree, code: Int): js.Tree = {
1079-
import scala.tools.nsc.backend.ScalaPrimitivesOps._
1079+
import dotty.tools.backend.ScalaPrimitivesOps._
10801080

10811081
implicit val pos = tree.span
10821082

@@ -1117,7 +1117,7 @@ class JSCodeGen()(implicit ctx: Context) {
11171117

11181118
/** Gen JS code for a simple binary operation. */
11191119
private def genSimpleBinaryOp(tree: Apply, lhs: Tree, rhs: Tree, code: Int): js.Tree = {
1120-
import scala.tools.nsc.backend.ScalaPrimitivesOps._
1120+
import dotty.tools.backend.ScalaPrimitivesOps._
11211121
import js.UnaryOp._
11221122

11231123
implicit val pos = tree.span
@@ -1332,7 +1332,7 @@ class JSCodeGen()(implicit ctx: Context) {
13321332
private def genUniversalEqualityOp(ltpe: Type, rtpe: Type, lhs: js.Tree, rhs: js.Tree, code: Int)(
13331333
implicit pos: Position): js.Tree = {
13341334

1335-
import scala.tools.nsc.backend.ScalaPrimitivesOps._
1335+
import dotty.tools.backend.ScalaPrimitivesOps._
13361336

13371337
val bypassEqEq = {
13381338
// Do not call equals if we have a literal null at either side.
@@ -1458,7 +1458,7 @@ class JSCodeGen()(implicit ctx: Context) {
14581458

14591459
/** Gen JS code for an array operation (get, set or length) */
14601460
private def genArrayOp(tree: Tree, code: Int): js.Tree = {
1461-
import scala.tools.nsc.backend.ScalaPrimitivesOps._
1461+
import dotty.tools.backend.ScalaPrimitivesOps._
14621462

14631463
implicit val pos = tree.span
14641464

‎compiler/src/dotty/tools/backend/sjs/JSPrimitives.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ object JSPrimitives {
4545

4646
class JSPrimitives(ctx: Context) extends DottyPrimitives(ctx) {
4747
import JSPrimitives._
48-
import scala.tools.nsc.backend.ScalaPrimitivesOps._
48+
import dotty.tools.backend.ScalaPrimitivesOps._
4949

5050
private lazy val jsPrimitives: Map[Symbol, Int] = initJSPrimitives(ctx)
5151

‎compiler/test/dotty/tools/dotc/CompilationTests.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -258,8 +258,8 @@ class CompilationTests extends ParallelTesting {
258258
compileShallowFilesInDir("compiler/src/dotty/tools/dotc/transform", opt) +
259259
compileShallowFilesInDir("compiler/src/dotty/tools/dotc/typer", opt) +
260260
compileShallowFilesInDir("compiler/src/dotty/tools/dotc/util", opt) +
261-
compileShallowFilesInDir("compiler/src/scala/tools/nsc/backend", opt) +
262-
compileShallowFilesInDir("compiler/src/scala/tools/nsc/backend/jvm", opt) +
261+
compileShallowFilesInDir("compiler/src/dotty/tools/backend", opt) +
262+
compileShallowFilesInDir("compiler/src/dotty/tools/backend/jvm", opt) +
263263
compileList("shallow-scalajs-ir", scalaJSIRSources, opt)
264264
}.keepOutput :: Nil
265265
}.map(_.checkCompile())

0 commit comments

Comments
 (0)