Skip to content

Commit 8b94c86

Browse files
committed
Move quote unpickling to the core package
1 parent 2aa05ef commit 8b94c86

File tree

7 files changed

+10
-16
lines changed

7 files changed

+10
-16
lines changed

compiler/src/dotty/tools/dotc/quoted/PickledQuotes.scala renamed to compiler/src/dotty/tools/dotc/core/quoted/PickledQuotes.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package dotty.tools.dotc.quoted
1+
package dotty.tools.dotc.core.quoted
22

33
import dotty.tools.dotc.ast.Trees._
44
import dotty.tools.dotc.ast.tpd
@@ -8,7 +8,7 @@ import dotty.tools.dotc.core.Contexts._
88
import dotty.tools.dotc.core.Decorators._
99
import dotty.tools.dotc.core.Flags._
1010
import dotty.tools.dotc.core.Symbols._
11-
import dotty.tools.dotc.core.tasty._
11+
import dotty.tools.dotc.core.tasty.{TastyPickler, TastyPrinter, TastyString}
1212
import dotty.tools.dotc.interpreter.RawQuoted
1313

1414
object PickledQuotes {
@@ -79,7 +79,7 @@ object PickledQuotes {
7979

8080
/** Unpickle TASTY bytes into it's tree */
8181
private def unpickle(bytes: Array[Byte], splices: Seq[Any])(implicit ctx: Context): Tree = {
82-
val unpickler = new dotty.tools.dotc.quoted.TastyUnpickler(bytes, splices)
82+
val unpickler = new TastyUnpickler(bytes, splices)
8383
unpickler.enter(roots = Set(defn.RootPackage))
8484
val tree = unpickler.body.head
8585
if (pickling ne noPrinter) {

compiler/src/dotty/tools/dotc/quoted/Quoted.scala renamed to compiler/src/dotty/tools/dotc/core/quoted/Quoted.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package dotty.tools.dotc.quoted
1+
package dotty.tools.dotc.core.quoted
22

33
import dotty.tools.dotc.ast.Trees.GenericApply
44
import dotty.tools.dotc.ast.tpd

compiler/src/dotty/tools/dotc/quoted/TastyUnpickler.scala renamed to compiler/src/dotty/tools/dotc/core/quoted/TastyUnpickler.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package dotty.tools.dotc.quoted
1+
package dotty.tools.dotc.core.quoted
22

33
import dotty.tools.dotc.core.tasty._
44
import dotty.tools.dotc.core.tasty.TastyUnpickler.NameTable

compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import scala.collection.{ mutable, immutable }
1919
import config.Printers.pickling
2020
import typer.Checking
2121
import config.Config
22-
import dotty.tools.dotc.quoted.PickledQuotes
22+
import dotty.tools.dotc.core.quoted.PickledQuotes
2323
import dotty.tools.dotc.interpreter.RawQuoted
2424
import scala.quoted.Expr
2525

compiler/src/dotty/tools/dotc/interpreter/Interpreter.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import dotty.tools.dotc.core.Contexts._
1010
import dotty.tools.dotc.core.Decorators._
1111
import dotty.tools.dotc.core.Names._
1212
import dotty.tools.dotc.core.Symbols._
13-
import dotty.tools.dotc.quoted.Quoted
13+
import dotty.tools.dotc.core.quoted.Quoted
1414
import dotty.tools.dotc.util.Positions.Position
1515

1616
import scala.reflect.ClassTag

compiler/src/dotty/tools/dotc/transform/ReifyQuotes.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ import NameKinds.OuterSelectName
1616

1717
import scala.collection.mutable
1818
import dotty.tools.dotc.core.StdNames._
19-
import dotty.tools.dotc.quoted.PickledQuotes
20-
import dotty.tools.dotc.quoted.Quoted
19+
import dotty.tools.dotc.core.quoted._
2120

2221

2322
/** Translates quoted terms and types to `unpickle` method calls.

compiler/src/dotty/tools/dotc/transform/Splicer.scala

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,10 @@
11
package dotty.tools.dotc
22
package transform
33

4-
import dotty.tools.dotc.core.Contexts._
5-
import dotty.tools.dotc.core.Symbols._
6-
import dotty.tools.dotc.ast.Trees._
74
import dotty.tools.dotc.ast.tpd
5+
import dotty.tools.dotc.core.Contexts._
6+
import dotty.tools.dotc.core.quoted._
87
import dotty.tools.dotc.interpreter._
9-
import dotty.tools.dotc.quoted.PickledQuotes
10-
import dotty.tools.dotc.quoted.Quoted
11-
12-
import scala.quoted
138

149
/** Utility class to slice quoted expressions */
1510
object Splicer {

0 commit comments

Comments
 (0)