Skip to content

Commit 0b55397

Browse files
Merge pull request #4580 from dotty-staging/move-dotty-tasty-impl
Move TastyImpl to tastyreflect
2 parents 2e4487f + 452e375 commit 0b55397

File tree

6 files changed

+11
-11
lines changed

6 files changed

+11
-11
lines changed

compiler/src/dotty/tools/dotc/tasty/CompilationUniverse.scala renamed to compiler/src/dotty/tools/dotc/tastyreflect/CompilationUniverse.scala

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

33
import dotty.tools.dotc.core.Contexts.Context
44

compiler/src/dotty/tools/dotc/tasty/FlagSet.scala renamed to compiler/src/dotty/tools/dotc/tastyreflect/FlagSet.scala

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

33
import dotty.tools.dotc.core.Flags
44
import dotty.tools.dotc.core.Flags._

compiler/src/dotty/tools/dotc/tasty/FromSymbol.scala renamed to compiler/src/dotty/tools/dotc/tastyreflect/FromSymbol.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package dotty.tools.dotc.tasty
1+
package dotty.tools.dotc.tastyreflect
22

33
import dotty.tools.dotc.ast.tpd
44
import dotty.tools.dotc.core.Contexts.Context
5-
import dotty.tools.dotc.core.Symbols._
65
import dotty.tools.dotc.core.Flags._
6+
import dotty.tools.dotc.core.Symbols._
77

88
object FromSymbol {
99

compiler/src/dotty/tools/dotc/tasty/TastyImpl.scala renamed to compiler/src/dotty/tools/dotc/tastyreflect/TastyImpl.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
package dotty.tools.dotc.tasty
1+
package dotty.tools.dotc.tastyreflect
22

33
import dotty.tools.dotc.ast.{Trees, tpd, untpd}
44
import dotty.tools.dotc.core
5-
import dotty.tools.dotc.core._
5+
import dotty.tools.dotc.core.Decorators._
66
import dotty.tools.dotc.core.StdNames.nme
77
import dotty.tools.dotc.core.Symbols.Symbol
8-
import dotty.tools.dotc.core.Decorators._
8+
import dotty.tools.dotc.core._
99
import dotty.tools.dotc.core.quoted.PickledQuotes
1010
import dotty.tools.dotc.reporting.Reporter
1111
import dotty.tools.dotc.reporting.diagnostic.MessageContainer

compiler/src/dotty/tools/dotc/tasty/package.scala renamed to compiler/src/dotty/tools/dotc/tastyreflect/package.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ import dotty.tools.dotc.ast.Trees.{Tree, Untyped}
44
import dotty.tools.dotc.core.Symbols.Symbol
55
import dotty.tools.dotc.core.Types.Type
66

7-
package object tasty {
7+
package object tastyreflect {
88

99
type PackageDefinition = PackageDefinitionImpl[Type]
1010

1111
/** Represents the symbol of a definition in tree form */
12-
case class PackageDefinitionImpl[-T >: Untyped] private[tasty] (symbol: Symbol) extends Tree[T] {
12+
case class PackageDefinitionImpl[-T >: Untyped] private[tastyreflect] (symbol: Symbol) extends Tree[T] {
1313
type ThisTree[-T >: Untyped] = PackageDefinitionImpl[T]
1414
}
1515

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import dotty.tools.dotc.core.quoted._
1515
import dotty.tools.dotc.core.Types._
1616
import dotty.tools.dotc.core.Symbols._
1717
import dotty.tools.dotc.core.TypeErasure
18-
import dotty.tools.dotc.tasty.CompilationUniverse
18+
import dotty.tools.dotc.tastyreflect.CompilationUniverse
1919

2020
import scala.util.control.NonFatal
2121
import dotty.tools.dotc.util.Positions.Position
@@ -38,7 +38,7 @@ object Splicer {
3838
val liftedArgs = getLiftedArgs(call, bindings)
3939
val interpreter = new Interpreter(pos, classLoader)
4040
val interpreted = interpreter.interpretCallToSymbol[Seq[Any] => Object](call.symbol)
41-
val tctx = new tasty.CompilationUniverse(ctx)
41+
val tctx = new CompilationUniverse(ctx)
4242
evaluateMacro(pos) {
4343
// Some parts of the macro are evaluated during the unpickling performed in quotedExprToTree
4444
val evaluated = interpreted.map(lambda => lambda(tctx :: liftedArgs).asInstanceOf[scala.quoted.Expr[Nothing]])

0 commit comments

Comments
 (0)