Skip to content

Commit b4d7084

Browse files
nicolasstuckinicolasstucki
authored
Merge pull request #10281 from dotty-staging/move-quote-internals-to-scala.quoted.internal
Fix #10222: Move scala.quoted.internal to scala.quoted.internal
2 parents 2788c99 + a3affa7 commit b4d7084

File tree

33 files changed

+215
-203
lines changed

33 files changed

+215
-203
lines changed

‎compiler/src/dotty/tools/dotc/core/Definitions.scala‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -795,11 +795,14 @@ class Definitions {
795795
@tu lazy val QuotedExprModule: Symbol = QuotedExprClass.companionModule
796796

797797
@tu lazy val QuoteContextClass: ClassSymbol = requiredClass("scala.quoted.QuoteContext")
798-
@tu lazy val QuoteContextInternalClass: ClassSymbol = requiredClass("scala.internal.quoted.QuoteContextInternal")
799-
@tu lazy val QuoteContextInternal_unpickleExpr: Symbol = QuoteContextInternalClass.requiredMethod("unpickleExpr")
800-
@tu lazy val QuoteContextInternal_unpickleType: Symbol = QuoteContextInternalClass.requiredMethod("unpickleType")
801-
@tu lazy val QuoteContextInternal_ExprMatch: Symbol = QuoteContextInternalClass.requiredMethod("ExprMatch")
802-
@tu lazy val QuoteContextInternal_TypeMatch: Symbol = QuoteContextInternalClass.requiredMethod("TypeMatch")
798+
799+
@tu lazy val QuoteUnpicklerClass: ClassSymbol = requiredClass("scala.quoted.internal.QuoteUnpickler")
800+
@tu lazy val QuoteUnpickler_unpickleExpr: Symbol = QuoteUnpicklerClass.requiredMethod("unpickleExpr")
801+
@tu lazy val QuoteUnpickler_unpickleType: Symbol = QuoteUnpicklerClass.requiredMethod("unpickleType")
802+
803+
@tu lazy val QuoteMatchingClass: ClassSymbol = requiredClass("scala.quoted.internal.QuoteMatching")
804+
@tu lazy val QuoteMatching_ExprMatch: Symbol = QuoteMatchingClass.requiredMethod("ExprMatch")
805+
@tu lazy val QuoteMatching_TypeMatch: Symbol = QuoteMatchingClass.requiredMethod("TypeMatch")
803806

804807
@tu lazy val LiftableModule: Symbol = requiredModule("scala.quoted.Liftable")
805808
@tu lazy val LiftableModule_BooleanLiftable: Symbol = LiftableModule.requiredMethod("BooleanLiftable")
@@ -812,13 +815,14 @@ class Definitions {
812815
@tu lazy val LiftableModule_CharLiftable: Symbol = LiftableModule.requiredMethod("CharLiftable")
813816
@tu lazy val LiftableModule_StringLiftable: Symbol = LiftableModule.requiredMethod("StringLiftable")
814817

815-
@tu lazy val InternalQuotedModule: Symbol = requiredModule("scala.internal.quoted.CompileTime")
816-
@tu lazy val InternalQuoted_exprQuote : Symbol = InternalQuotedModule.requiredMethod("exprQuote")
817-
@tu lazy val InternalQuoted_exprSplice : Symbol = InternalQuotedModule.requiredMethod("exprSplice")
818-
@tu lazy val InternalQuoted_exprNestedSplice : Symbol = InternalQuotedModule.requiredMethod("exprNestedSplice")
819-
@tu lazy val InternalQuoted_QuoteTypeTagAnnot: ClassSymbol = InternalQuotedModule.requiredClass("quoteTypeTag")
818+
@tu lazy val InternalQuotedModule: Symbol = requiredModule("scala.quoted.internal.Expr")
819+
@tu lazy val InternalQuoted_exprQuote : Symbol = InternalQuotedModule.requiredMethod("quote")
820+
@tu lazy val InternalQuoted_exprSplice : Symbol = InternalQuotedModule.requiredMethod("splice")
821+
@tu lazy val InternalQuoted_exprNestedSplice : Symbol = InternalQuotedModule.requiredMethod("nestedSplice")
822+
823+
@tu lazy val InternalQuoted_SplicedTypeAnnot: ClassSymbol = requiredClass("scala.quoted.internal.SplicedType")
820824

821-
@tu lazy val InternalQuotedPatterns: Symbol = requiredModule("scala.internal.quoted.Patterns")
825+
@tu lazy val InternalQuotedPatterns: Symbol = requiredModule("scala.quoted.internal.Patterns")
822826
@tu lazy val InternalQuotedPatterns_patternHole: Symbol = InternalQuotedPatterns.requiredMethod("patternHole")
823827
@tu lazy val InternalQuotedPatterns_patternHigherOrderHole: Symbol = InternalQuotedPatterns.requiredMethod("patternHigherOrderHole")
824828
@tu lazy val InternalQuotedPatterns_higherOrderHole: Symbol = InternalQuotedPatterns.requiredMethod("higherOrderHole")

‎compiler/src/scala/quoted/internal/Expr.scala‎ renamed to ‎compiler/src/dotty/tools/dotc/quoted/ExprImpl.scala‎

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

33
import scala.quoted._
44

@@ -11,9 +11,9 @@ import dotty.tools.dotc.ast.tpd
1111
*
1212
* May contain references to code defined outside this Expr instance.
1313
*/
14-
final class Expr(val tree: tpd.Tree, val scopeId: Int) extends scala.quoted.Expr[Any] {
14+
final class ExprImpl(val tree: tpd.Tree, val scopeId: Int) extends scala.quoted.internal.Expr[Any] {
1515
override def equals(that: Any): Boolean = that match {
16-
case that: Expr =>
16+
case that: ExprImpl =>
1717
// Expr are wrappers around trees, therefore they are equals if their trees are equal.
1818
// All scopeId should be equal unless two different runs of the compiler created the trees.
1919
tree == that.tree && scopeId == that.scopeId

‎compiler/src/dotty/tools/dotc/quoted/PickledQuotes.scala‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@ object PickledQuotes {
3838

3939
/** Transform the expression into its fully spliced Tree */
4040
def quotedExprToTree[T](expr: quoted.Expr[T])(using Context): Tree = {
41-
val expr1 = expr.asInstanceOf[scala.quoted.internal.Expr]
41+
val expr1 = expr.asInstanceOf[dotty.tools.dotc.quoted.ExprImpl]
4242
expr1.checkScopeId(QuoteContextImpl.scopeId)
4343
changeOwnerOfTree(expr1.tree, ctx.owner)
4444
}
4545

4646
/** Transform the expression into its fully spliced TypeTree */
4747
def quotedTypeToTree(tpe: quoted.Type[?])(using Context): Tree = {
48-
val tpe1 = tpe.asInstanceOf[scala.quoted.internal.Type]
48+
val tpe1 = tpe.asInstanceOf[dotty.tools.dotc.quoted.TypeImpl]
4949
tpe1.checkScopeId(QuoteContextImpl.scopeId)
5050
changeOwnerOfTree(tpe1.typeTree, ctx.owner)
5151
}
@@ -72,8 +72,8 @@ object PickledQuotes {
7272
override def transform(tree: tpd.Tree)(using Context): tpd.Tree = tree match {
7373
case Hole(isTerm, idx, args) =>
7474
val reifiedArgs = args.map { arg =>
75-
if (arg.isTerm) (using qctx: QuoteContext) => new scala.quoted.internal.Expr(arg, QuoteContextImpl.scopeId)
76-
else new scala.quoted.internal.Type(arg, QuoteContextImpl.scopeId)
75+
if (arg.isTerm) (using qctx: QuoteContext) => new dotty.tools.dotc.quoted.ExprImpl(arg, QuoteContextImpl.scopeId)
76+
else new dotty.tools.dotc.quoted.TypeImpl(arg, QuoteContextImpl.scopeId)
7777
}
7878
if isTerm then
7979
val quotedExpr = termHole(idx, reifiedArgs, dotty.tools.dotc.quoted.QuoteContextImpl())
@@ -123,10 +123,10 @@ object PickledQuotes {
123123
/** Replace all type holes generated with the spliced types */
124124
private def spliceTypes(tree: Tree, typeHole: (Int, Seq[Any]) => scala.quoted.Type[?], termHole: (Int, Seq[Int], scala.quoted.QuoteContext) => Any)(using Context): Tree = {
125125
tree match
126-
case Block(stat :: rest, expr1) if stat.symbol.hasAnnotation(defn.InternalQuoted_QuoteTypeTagAnnot) =>
126+
case Block(stat :: rest, expr1) if stat.symbol.hasAnnotation(defn.InternalQuoted_SplicedTypeAnnot) =>
127127
val typeSpliceMap = (stat :: rest).iterator.map {
128128
case tdef: TypeDef =>
129-
assert(tdef.symbol.hasAnnotation(defn.InternalQuoted_QuoteTypeTagAnnot))
129+
assert(tdef.symbol.hasAnnotation(defn.InternalQuoted_SplicedTypeAnnot))
130130
val tree = tdef.rhs match
131131
case TypeBoundsTree(_, Hole(_, idx, args), _) =>
132132
val quotedType = typeHole(idx, args)
@@ -141,7 +141,7 @@ object PickledQuotes {
141141
tp.derivedClassInfo(classParents = tp.classParents.map(apply))
142142
case tp: TypeRef =>
143143
typeSpliceMap.get(tp.symbol) match
144-
case Some(t) if tp.typeSymbol.hasAnnotation(defn.InternalQuoted_QuoteTypeTagAnnot) => mapOver(t)
144+
case Some(t) if tp.typeSymbol.hasAnnotation(defn.InternalQuoted_SplicedTypeAnnot) => mapOver(t)
145145
case _ => mapOver(tp)
146146
case _ =>
147147
mapOver(tp)

‎compiler/src/dotty/tools/dotc/quoted/QuoteContextImpl.scala‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import dotty.tools.dotc.quoted.QuoteUtils._
1414
import dotty.tools.dotc.core.Decorators._
1515

1616
import scala.quoted.QuoteContext
17+
import scala.quoted.internal.{QuoteUnpickler, QuoteMatching}
1718
import dotty.tools.dotc.quoted.printers.{Extractors, SourceCode, SyntaxHighlight}
1819

1920
import scala.tasty.reflect._
@@ -40,7 +41,7 @@ object QuoteContextImpl {
4041

4142
}
4243

43-
class QuoteContextImpl private (ctx: Context) extends QuoteContext, scala.internal.quoted.QuoteContextInternal:
44+
class QuoteContextImpl private (ctx: Context) extends QuoteContext, QuoteUnpickler, QuoteMatching:
4445

4546
object reflect extends scala.tasty.Reflection:
4647

@@ -71,7 +72,7 @@ class QuoteContextImpl private (ctx: Context) extends QuoteContext, scala.intern
7172
case _ => false
7273
def asExpr: scala.quoted.Expr[Any] =
7374
if self.isExpr then
74-
new scala.quoted.internal.Expr(self, QuoteContextImpl.this.hashCode)
75+
new dotty.tools.dotc.quoted.ExprImpl(self, QuoteContextImpl.this.hashCode)
7576
else self match
7677
case TermTypeTest(self) => throw new Exception("Expected an expression. This is a partially applied Term. Try eta-expanding the term first.")
7778
case _ => throw new Exception("Expected a Term but was: " + self)
@@ -315,11 +316,11 @@ class QuoteContextImpl private (ctx: Context) extends QuoteContext, scala.intern
315316
object TermMethodsImpl extends TermMethods:
316317
extension (self: Term):
317318
def seal: scala.quoted.Expr[Any] =
318-
if self.isExpr then new scala.quoted.internal.Expr(self, QuoteContextImpl.this.hashCode)
319+
if self.isExpr then new dotty.tools.dotc.quoted.ExprImpl(self, QuoteContextImpl.this.hashCode)
319320
else throw new Exception("Cannot seal a partially applied Term. Try eta-expanding the term first.")
320321

321322
def sealOpt: Option[scala.quoted.Expr[Any]] =
322-
if self.isExpr then Some(new scala.quoted.internal.Expr(self, QuoteContextImpl.this.hashCode))
323+
if self.isExpr then Some(new dotty.tools.dotc.quoted.ExprImpl(self, QuoteContextImpl.this.hashCode))
323324
else None
324325

325326
def tpe: TypeRepr = self.tpe
@@ -1002,7 +1003,7 @@ class QuoteContextImpl private (ctx: Context) extends QuoteContext, scala.intern
10021003

10031004
object TypeTree extends TypeTreeModule:
10041005
def of[T <: AnyKind](using tp: scala.quoted.Type[T]): TypeTree =
1005-
tp.asInstanceOf[scala.quoted.internal.Type].typeTree
1006+
tp.asInstanceOf[dotty.tools.dotc.quoted.TypeImpl].typeTree
10061007
end TypeTree
10071008

10081009
object TypeTreeMethodsImpl extends TypeTreeMethods:
@@ -1571,7 +1572,7 @@ class QuoteContextImpl private (ctx: Context) extends QuoteContext, scala.intern
15711572

15721573
object TypeRepr extends TypeReprModule:
15731574
def of[T <: AnyKind](using tp: scala.quoted.Type[T]): TypeRepr =
1574-
tp.asInstanceOf[scala.quoted.internal.Type].typeTree.tpe
1575+
tp.asInstanceOf[dotty.tools.dotc.quoted.TypeImpl].typeTree.tpe
15751576
def typeConstructorOf(clazz: Class[?]): TypeRepr =
15761577
if (clazz.isPrimitive)
15771578
if (clazz == classOf[Boolean]) dotc.core.Symbols.defn.BooleanType
@@ -1608,7 +1609,7 @@ class QuoteContextImpl private (ctx: Context) extends QuoteContext, scala.intern
16081609
def seal: scala.quoted.Type[_] = self.asType
16091610

16101611
def asType: scala.quoted.Type[?] =
1611-
new scala.quoted.internal.Type(Inferred(self), QuoteContextImpl.this.hashCode)
1612+
new dotty.tools.dotc.quoted.TypeImpl(Inferred(self), QuoteContextImpl.this.hashCode)
16121613

16131614
def =:=(that: TypeRepr): Boolean = self =:= that
16141615
def <:<(that: TypeRepr): Boolean = self <:< that
@@ -2623,11 +2624,11 @@ class QuoteContextImpl private (ctx: Context) extends QuoteContext, scala.intern
26232624

26242625
def unpickleExpr[T](pickled: String | List[String], typeHole: (Int, Seq[Any]) => scala.quoted.Type[?], termHole: (Int, Seq[Any], scala.quoted.QuoteContext) => scala.quoted.Expr[?]): scala.quoted.Expr[T] =
26252626
val tree = PickledQuotes.unpickleTerm(pickled, typeHole, termHole)(using reflect.rootContext)
2626-
new scala.quoted.internal.Expr(tree, hash).asInstanceOf[scala.quoted.Expr[T]]
2627+
new dotty.tools.dotc.quoted.ExprImpl(tree, hash).asInstanceOf[scala.quoted.Expr[T]]
26272628

26282629
def unpickleType[T <: AnyKind](pickled: String | List[String], typeHole: (Int, Seq[Any]) => scala.quoted.Type[?], termHole: (Int, Seq[Any], scala.quoted.QuoteContext) => scala.quoted.Expr[?]): scala.quoted.Type[T] =
26292630
val tree = PickledQuotes.unpickleTypeTree(pickled, typeHole, termHole)(using reflect.rootContext)
2630-
new scala.quoted.internal.Type(tree, hash).asInstanceOf[scala.quoted.Type[T]]
2631+
new dotty.tools.dotc.quoted.TypeImpl(tree, hash).asInstanceOf[scala.quoted.Type[T]]
26312632

26322633
object ExprMatch extends ExprMatchModule:
26332634
def unapply[TypeBindings <: Tuple, Tup <: Tuple](scrutinee: scala.quoted.Expr[Any])(using pattern: scala.quoted.Expr[Any]): Option[Tup] =

‎compiler/src/scala/quoted/internal/ScopeException.scala‎ renamed to ‎compiler/src/dotty/tools/dotc/quoted/ScopeException.scala‎

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

33
class ScopeException(msg: String) extends Exception(msg)

‎compiler/src/scala/quoted/internal/Type.scala‎ renamed to ‎compiler/src/dotty/tools/dotc/quoted/TypeImpl.scala‎

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

33
import scala.quoted._
44

55
import dotty.tools.dotc.ast.tpd
66

77
/** Quoted type (or kind) `T` backed by a tree */
8-
final class Type(val typeTree: tpd.Tree, val scopeId: Int) extends scala.quoted.Type[?] {
8+
final class TypeImpl(val typeTree: tpd.Tree, val scopeId: Int) extends scala.quoted.internal.Type[?] {
99
override def equals(that: Any): Boolean = that match {
10-
case that: Type => typeTree ==
10+
case that: TypeImpl => typeTree ==
1111
// TastyTreeExpr are wrappers around trees, therfore they are equals if their trees are equal.
1212
// All scopeId should be equal unless two different runs of the compiler created the trees.
1313
that.typeTree && scopeId == that.scopeId

‎compiler/src/dotty/tools/dotc/transform/PCPCheckAndHeal.scala‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ class PCPCheckAndHeal(@constructorOnly ictx: Context) extends TreeMapWithStages(
174174
tp match
175175
case tp: TypeRef =>
176176
tp.prefix match
177-
case NoPrefix if level > levelOf(tp.symbol) && !tp.typeSymbol.hasAnnotation(defn.InternalQuoted_QuoteTypeTagAnnot) =>
177+
case NoPrefix if level > levelOf(tp.symbol) && !tp.typeSymbol.hasAnnotation(defn.InternalQuoted_SplicedTypeAnnot) =>
178178
val tp1 = tp.dealias
179179
if tp1 != tp then apply(tp1)
180180
else tryHeal(tp.symbol, tp, pos)
@@ -279,7 +279,7 @@ object PCPCheckAndHeal {
279279
flags = Synthetic,
280280
info = TypeAlias(splicedTree.tpe.select(tpnme.Underlying)),
281281
coord = span).asType
282-
local.addAnnotation(Annotation(defn.InternalQuoted_QuoteTypeTagAnnot))
282+
local.addAnnotation(Annotation(defn.InternalQuoted_SplicedTypeAnnot))
283283
ctx.typeAssigner.assignType(untpd.TypeDef(local.name, alias), local)
284284
}
285285

‎compiler/src/dotty/tools/dotc/transform/PickleQuotes.scala‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ class PickleQuotes extends MacroTransform {
8282
assert(!tree.symbol.isQuote)
8383
assert(!tree.symbol.isExprSplice)
8484
case _ : TypeDef =>
85-
assert(!tree.symbol.hasAnnotation(defn.InternalQuoted_QuoteTypeTagAnnot),
85+
assert(!tree.symbol.hasAnnotation(defn.InternalQuoted_SplicedTypeAnnot),
8686
s"${tree.symbol} should have been removed by PickledQuotes because it has a @quoteTypeTag")
8787
case _ =>
8888
}
@@ -193,11 +193,11 @@ class PickleQuotes extends MacroTransform {
193193
}
194194
}
195195

196-
/** Encode quote using QuoteContextInternal.{unpickleExpr, unpickleType}
196+
/** Encode quote using QuoteUnpickler.{unpickleExpr, unpickleType}
197197
*
198198
* Generate the code
199199
* ```scala
200-
* qctx => qctx.asInstanceOf[QuoteContextInternal].<unpickleExpr|unpickleType>[<type>](
200+
* qctx => qctx.asInstanceOf[QuoteUnpickler].<unpickleExpr|unpickleType>[<type>](
201201
* <pickledQuote>,
202202
* <typeHole>,
203203
* <termHole>,
@@ -255,8 +255,8 @@ class PickleQuotes extends MacroTransform {
255255
val quotedType = quoteClass.typeRef.appliedTo(originalTp)
256256
val lambdaTpe = MethodType(defn.QuoteContextClass.typeRef :: Nil, quotedType)
257257
def callUnpickle(ts: List[Tree]) = {
258-
val qctx = ts.head.asInstance(defn.QuoteContextInternalClass.typeRef)
259-
val unpickleMeth = if isType then defn.QuoteContextInternal_unpickleType else defn.QuoteContextInternal_unpickleExpr
258+
val qctx = ts.head.asInstance(defn.QuoteUnpicklerClass.typeRef)
259+
val unpickleMeth = if isType then defn.QuoteUnpickler_unpickleType else defn.QuoteUnpickler_unpickleExpr
260260
qctx.select(unpickleMeth).appliedToType(originalTp).appliedTo(pickledQuoteStrings, typeHoles, termHoles)
261261
}
262262
Lambda(lambdaTpe, callUnpickle).withSpan(body.span)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -323,10 +323,10 @@ object Splicer {
323323
}
324324

325325
private def interpretQuote(tree: Tree)(implicit env: Env): Object =
326-
new scala.quoted.internal.Expr(Inlined(EmptyTree, Nil, QuoteUtils.changeOwnerOfTree(tree, ctx.owner)).withSpan(tree.span), QuoteContextImpl.scopeId)
326+
new dotty.tools.dotc.quoted.ExprImpl(Inlined(EmptyTree, Nil, QuoteUtils.changeOwnerOfTree(tree, ctx.owner)).withSpan(tree.span), QuoteContextImpl.scopeId)
327327

328328
private def interpretTypeQuote(tree: Tree)(implicit env: Env): Object =
329-
new scala.quoted.internal.Type(QuoteUtils.changeOwnerOfTree(tree, ctx.owner), QuoteContextImpl.scopeId)
329+
new dotty.tools.dotc.quoted.TypeImpl(QuoteUtils.changeOwnerOfTree(tree, ctx.owner), QuoteContextImpl.scopeId)
330330

331331
private def interpretLiteral(value: Any)(implicit env: Env): Object =
332332
value.asInstanceOf[Object]

‎compiler/src/dotty/tools/dotc/transform/Staging.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class Staging extends MacroTransform {
4949
else i"${sym.name}.this"
5050
val errMsg = s"\nin ${ctx.owner.fullName}"
5151
assert(
52-
ctx.owner.hasAnnotation(defn.InternalQuoted_QuoteTypeTagAnnot) ||
52+
ctx.owner.hasAnnotation(defn.InternalQuoted_SplicedTypeAnnot) ||
5353
(sym.isType && levelOf(sym) > 0),
5454
em"""access to $symStr from wrong staging level:
5555
| - the definition is at level ${levelOf(sym)},

0 commit comments

Comments
 (0)