Skip to content

Refactor level checking / type healing logic #17082

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
Mar 14, 2023
Merged

Refactor level checking / type healing logic #17082

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
4172269
Strip annotations from the type of a quoted expression
nicolasstucki Mar 13, 2023
8362d14
Refactor level checking / type healing logic
nicolasstucki Mar 10, 2023
67a6475
Extract StagingLevel from TreeMapWithStages
nicolasstucki Mar 13, 2023
527a9ec
Remove mutable state from StagingLevel
nicolasstucki Mar 13, 2023
6d351f9
Move PCPCheckAndHeal to dotty.tools.dotc.staging
nicolasstucki Mar 13, 2023
aa73a70
Move TreeMapWithStages to dotty.tools.dotc.staging
nicolasstucki Mar 13, 2023
bd5e3b0
Remove Checking from PCPCheckAndHeal
nicolasstucki Mar 13, 2023
f32e204
Split annotation splice transformation from type healing
nicolasstucki Mar 13, 2023
915c44c
Extract HealType from PCPCheckAndHeal
nicolasstucki Mar 13, 2023
540277b
Move level tracking into StagingLevel
nicolasstucki Mar 13, 2023
9cbc14c
Move StagingContext to dotty.tools.dotc.staging
nicolasstucki Mar 13, 2023
6d02874
Extract QuoteTypeTags
nicolasstucki Mar 13, 2023
3cbc635
Rename StagingContext to QuoteContext
nicolasstucki Mar 13, 2023
61165cc
Update compiler/src/dotty/tools/dotc/staging/HealType.scala
nicolasstucki Mar 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Rename StagingContext to QuoteContext
  • Loading branch information
@nicolasstucki
nicolasstucki committed Mar 13, 2023
commit 3cbc635f861eb2e2d9fe1aa6a3251761b2f55663
2 changes: 1 addition & 1 deletion compiler/src/dotty/tools/dotc/quoted/Interpreter.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import dotty.tools.dotc.core.Symbols._
import dotty.tools.dotc.core.TypeErasure
import dotty.tools.dotc.core.Types._
import dotty.tools.dotc.quoted._
import dotty.tools.dotc.staging.StagingContext.*
import dotty.tools.dotc.staging.QuoteContext.*
import dotty.tools.dotc.typer.ImportInfo.withRootImports
import dotty.tools.dotc.util.SrcPos
import dotty.tools.dotc.reporting.Message
Expand Down
2 changes: 1 addition & 1 deletion compiler/src/dotty/tools/dotc/staging/HealType.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import dotty.tools.dotc.core.Decorators._
import dotty.tools.dotc.core.Flags._
import dotty.tools.dotc.core.Symbols._
import dotty.tools.dotc.core.Types._
import dotty.tools.dotc.staging.StagingContext.*
import dotty.tools.dotc.staging.QuoteContext.*
import dotty.tools.dotc.staging.StagingLevel.*
import dotty.tools.dotc.staging.QuoteTypeTags.*
import dotty.tools.dotc.transform.SymUtils._
Expand Down
6 changes: 3 additions & 3 deletions compiler/src/dotty/tools/dotc/staging/PCPCheckAndHeal.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import dotty.tools.dotc.core.NameKinds._
import dotty.tools.dotc.core.StdNames._
import dotty.tools.dotc.core.Symbols._
import dotty.tools.dotc.core.Types._
import dotty.tools.dotc.staging.StagingContext.*
import dotty.tools.dotc.staging.QuoteContext.*
import dotty.tools.dotc.staging.StagingLevel.*
import dotty.tools.dotc.staging.QuoteTypeTags.*
import dotty.tools.dotc.util.Property
Expand Down Expand Up @@ -146,11 +146,11 @@ class PCPCheckAndHeal extends TreeMapWithStages {
// `quoted.runtime.Expr.quote[F[T]](... T ...)` --> `internal.Quoted.expr[F[$t]](... T ...)`
val tp = healType(splice.srcPos)(splice.tpe.widenTermRefExpr)
cpy.Apply(splice)(cpy.TypeApply(fun)(fun.fun, tpd.TypeTree(tp) :: Nil), body1 :: Nil)
case f @ Apply(fun @ TypeApply(_, _), qctx :: Nil) =>
case f @ Apply(fun @ TypeApply(_, _), quotes :: Nil) =>
// Type of the splice itself must also be healed
// `quoted.runtime.Expr.quote[F[T]](... T ...)` --> `internal.Quoted.expr[F[$t]](... T ...)`
val tp = healType(splice.srcPos)(splice.tpe.widenTermRefExpr)
cpy.Apply(splice)(cpy.Apply(f)(cpy.TypeApply(fun)(fun.fun, tpd.TypeTree(tp) :: Nil), qctx :: Nil), body1 :: Nil)
cpy.Apply(splice)(cpy.Apply(f)(cpy.TypeApply(fun)(fun.fun, tpd.TypeTree(tp) :: Nil), quotes :: Nil), body1 :: Nil)
}
}

Expand Down
6 changes: 3 additions & 3 deletions ...y/tools/dotc/staging/StagingContext.scala → ...tty/tools/dotc/staging/QuoteContext.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,17 @@ import dotty.tools.dotc.util.Property
import dotty.tools.dotc.staging.PCPCheckAndHeal
import dotty.tools.dotc.staging.StagingLevel.*

object StagingContext {
object QuoteContext {

/** A key to be used in a context property that tracks the quotation stack.
* Stack containing the Quotes references received by the surrounding quotes.
*/
private val QuotesStack = new Property.Key[List[tpd.Tree]]

/** Context with an incremented quotation level and pushes a reference to a Quotes on the quote context stack */
def pushQuotes(qctxRef: tpd.Tree)(using Context): Context =
def pushQuotes(quotes: tpd.Tree)(using Context): Context =
val old = ctx.property(QuotesStack).getOrElse(List.empty)
quoteContext.setProperty(QuotesStack, qctxRef :: old)
quoteContext.setProperty(QuotesStack, quotes :: old)

/** Context with a decremented quotation level and pops the Some of top of the quote context stack or None if the stack is empty.
* The quotation stack could be empty if we are in a top level splice or an erroneous splice directly within a top level splice.
Expand Down
2 changes: 1 addition & 1 deletion compiler/src/dotty/tools/dotc/transform/Inlining.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import dotty.tools.dotc.quoted._
import dotty.tools.dotc.inlines.Inlines
import dotty.tools.dotc.ast.TreeMapWithImplicits
import dotty.tools.dotc.core.DenotTransformers.IdentityDenotTransformer
import dotty.tools.dotc.staging.StagingContext.*
import dotty.tools.dotc.staging.QuoteContext.*
import dotty.tools.dotc.staging.StagingLevel

import scala.collection.mutable.ListBuffer
Expand Down
2 changes: 1 addition & 1 deletion compiler/src/dotty/tools/dotc/transform/Splicing.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import dotty.tools.dotc.core.StdNames._
import dotty.tools.dotc.quoted._
import dotty.tools.dotc.config.ScalaRelease.*
import dotty.tools.dotc.staging.PCPCheckAndHeal
import dotty.tools.dotc.staging.StagingContext.*
import dotty.tools.dotc.staging.QuoteContext.*
import dotty.tools.dotc.staging.StagingLevel.*
import dotty.tools.dotc.staging.QuoteTypeTags

Expand Down
2 changes: 1 addition & 1 deletion compiler/src/dotty/tools/dotc/transform/Staging.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import dotty.tools.dotc.core.Symbols._
import dotty.tools.dotc.core.Types._
import dotty.tools.dotc.util.SrcPos
import dotty.tools.dotc.transform.SymUtils._
import dotty.tools.dotc.staging.StagingContext.*
import dotty.tools.dotc.staging.QuoteContext.*
import dotty.tools.dotc.staging.StagingLevel.*
import dotty.tools.dotc.staging.PCPCheckAndHeal
import dotty.tools.dotc.staging.HealType
Expand Down
2 changes: 1 addition & 1 deletion compiler/src/dotty/tools/dotc/typer/QuotesAndSplices.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import dotty.tools.dotc.core.StdNames._
import dotty.tools.dotc.core.Symbols._
import dotty.tools.dotc.core.Types._
import dotty.tools.dotc.inlines.PrepareInlineable
import dotty.tools.dotc.staging.StagingContext.*
import dotty.tools.dotc.staging.QuoteContext.*
import dotty.tools.dotc.staging.StagingLevel.*
import dotty.tools.dotc.transform.SymUtils._
import dotty.tools.dotc.typer.Implicits._
Expand Down