diff --git a/compiler/src/dotty/tools/dotc/tasty/CompilationUniverse.scala b/compiler/src/dotty/tools/dotc/tastyreflect/CompilationUniverse.scala similarity index 81% rename from compiler/src/dotty/tools/dotc/tasty/CompilationUniverse.scala rename to compiler/src/dotty/tools/dotc/tastyreflect/CompilationUniverse.scala index f1863ead499a..641e0bfea8ab 100644 --- a/compiler/src/dotty/tools/dotc/tasty/CompilationUniverse.scala +++ b/compiler/src/dotty/tools/dotc/tastyreflect/CompilationUniverse.scala @@ -1,4 +1,4 @@ -package dotty.tools.dotc.tasty +package dotty.tools.dotc.tastyreflect import dotty.tools.dotc.core.Contexts.Context diff --git a/compiler/src/dotty/tools/dotc/tasty/FlagSet.scala b/compiler/src/dotty/tools/dotc/tastyreflect/FlagSet.scala similarity index 98% rename from compiler/src/dotty/tools/dotc/tasty/FlagSet.scala rename to compiler/src/dotty/tools/dotc/tastyreflect/FlagSet.scala index 483bd3e242f7..4c8e49ac3d32 100644 --- a/compiler/src/dotty/tools/dotc/tasty/FlagSet.scala +++ b/compiler/src/dotty/tools/dotc/tastyreflect/FlagSet.scala @@ -1,4 +1,4 @@ -package dotty.tools.dotc.tasty +package dotty.tools.dotc.tastyreflect import dotty.tools.dotc.core.Flags import dotty.tools.dotc.core.Flags._ diff --git a/compiler/src/dotty/tools/dotc/tasty/FromSymbol.scala b/compiler/src/dotty/tools/dotc/tastyreflect/FromSymbol.scala similarity index 97% rename from compiler/src/dotty/tools/dotc/tasty/FromSymbol.scala rename to compiler/src/dotty/tools/dotc/tastyreflect/FromSymbol.scala index deaf5cfd9b9a..38882c2c8e35 100644 --- a/compiler/src/dotty/tools/dotc/tasty/FromSymbol.scala +++ b/compiler/src/dotty/tools/dotc/tastyreflect/FromSymbol.scala @@ -1,9 +1,9 @@ -package dotty.tools.dotc.tasty +package dotty.tools.dotc.tastyreflect import dotty.tools.dotc.ast.tpd import dotty.tools.dotc.core.Contexts.Context -import dotty.tools.dotc.core.Symbols._ import dotty.tools.dotc.core.Flags._ +import dotty.tools.dotc.core.Symbols._ object FromSymbol { diff --git a/compiler/src/dotty/tools/dotc/tasty/TastyImpl.scala b/compiler/src/dotty/tools/dotc/tastyreflect/TastyImpl.scala similarity index 99% rename from compiler/src/dotty/tools/dotc/tasty/TastyImpl.scala rename to compiler/src/dotty/tools/dotc/tastyreflect/TastyImpl.scala index 8cd3303de74c..eff0e56fa831 100644 --- a/compiler/src/dotty/tools/dotc/tasty/TastyImpl.scala +++ b/compiler/src/dotty/tools/dotc/tastyreflect/TastyImpl.scala @@ -1,11 +1,11 @@ -package dotty.tools.dotc.tasty +package dotty.tools.dotc.tastyreflect import dotty.tools.dotc.ast.{Trees, tpd, untpd} import dotty.tools.dotc.core -import dotty.tools.dotc.core._ +import dotty.tools.dotc.core.Decorators._ import dotty.tools.dotc.core.StdNames.nme import dotty.tools.dotc.core.Symbols.Symbol -import dotty.tools.dotc.core.Decorators._ +import dotty.tools.dotc.core._ import dotty.tools.dotc.core.quoted.PickledQuotes import dotty.tools.dotc.reporting.Reporter import dotty.tools.dotc.reporting.diagnostic.MessageContainer diff --git a/compiler/src/dotty/tools/dotc/tasty/package.scala b/compiler/src/dotty/tools/dotc/tastyreflect/package.scala similarity index 71% rename from compiler/src/dotty/tools/dotc/tasty/package.scala rename to compiler/src/dotty/tools/dotc/tastyreflect/package.scala index 106bae5f64a0..4a90eb60e9ab 100644 --- a/compiler/src/dotty/tools/dotc/tasty/package.scala +++ b/compiler/src/dotty/tools/dotc/tastyreflect/package.scala @@ -4,12 +4,12 @@ import dotty.tools.dotc.ast.Trees.{Tree, Untyped} import dotty.tools.dotc.core.Symbols.Symbol import dotty.tools.dotc.core.Types.Type -package object tasty { +package object tastyreflect { type PackageDefinition = PackageDefinitionImpl[Type] /** Represents the symbol of a definition in tree form */ - case class PackageDefinitionImpl[-T >: Untyped] private[tasty] (symbol: Symbol) extends Tree[T] { + case class PackageDefinitionImpl[-T >: Untyped] private[tastyreflect] (symbol: Symbol) extends Tree[T] { type ThisTree[-T >: Untyped] = PackageDefinitionImpl[T] } diff --git a/compiler/src/dotty/tools/dotc/transform/Splicer.scala b/compiler/src/dotty/tools/dotc/transform/Splicer.scala index de26f7c75103..040bca240584 100644 --- a/compiler/src/dotty/tools/dotc/transform/Splicer.scala +++ b/compiler/src/dotty/tools/dotc/transform/Splicer.scala @@ -15,7 +15,7 @@ import dotty.tools.dotc.core.quoted._ import dotty.tools.dotc.core.Types._ import dotty.tools.dotc.core.Symbols._ import dotty.tools.dotc.core.TypeErasure -import dotty.tools.dotc.tasty.CompilationUniverse +import dotty.tools.dotc.tastyreflect.CompilationUniverse import scala.util.control.NonFatal import dotty.tools.dotc.util.Positions.Position @@ -38,7 +38,7 @@ object Splicer { val liftedArgs = getLiftedArgs(call, bindings) val interpreter = new Interpreter(pos, classLoader) val interpreted = interpreter.interpretCallToSymbol[Seq[Any] => Object](call.symbol) - val tctx = new tasty.CompilationUniverse(ctx) + val tctx = new CompilationUniverse(ctx) evaluateMacro(pos) { // Some parts of the macro are evaluated during the unpickling performed in quotedExprToTree val evaluated = interpreted.map(lambda => lambda(tctx :: liftedArgs).asInstanceOf[scala.quoted.Expr[Nothing]])