Extract quote reification from Staging phase #5763
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nicolasstucki
force-pushed
the
split-staging-2
branch
16 times, most recently
from
e7ffcae to
2751b14
Compare
nicolasstucki
force-pushed
the
split-staging-2
branch
from
5f4664a to
50114ec
Compare
ghost
added
nicolasstucki
changed the title
nicolasstucki
force-pushed
the
split-staging-2
branch
from
50114ec to
55d62d6
Compare
3 tasks
nicolasstucki
force-pushed
the
split-staging-2
branch
from
17771f5 to
5fcab04
Compare
nicolasstucki
force-pushed
the
split-staging-2
branch
from
9cd54ba to
2082ba0
Compare
|
Rebased |
odersky
approved these changes
Feb 10, 2019
| if (tree.fun.hasType && tree.fun.symbol == defn.QuotedType_apply) | ||
| keywordStr("'[") ~ toTextGlobal(tree.args, ", ") ~ keywordStr("]") | ||
| else | ||
| toTextLocal(tree.fun) ~ "[" ~ toTextGlobal(tree.args, ", ") ~ "]" |
There was a problem hiding this comment.
keywordStr in both branches? Also, why not factor out the prefix?
val leading =
if (tree.fun.hasType && tree.fun.symbol == defn.QuotedType_apply) keywordStr("'[")
else toTextLocal(tree.fun) ~ keywordStr("[")
leading ~ toTextGlobal(tree.args, ", ") ~ keywordStr("]")There was a problem hiding this comment.
The suffix also depends on the condition. Though I can refactor it a bit.
val isQuote = tree.fun.hasType && tree.fun.symbol == defn.QuotedType_apply
val (open, close) = if (isQuote) (keywordStr("'["), keywordStr("]")) else ("[", "]")
toTextLocal(tree.fun).provided(!isQuote) ~ open ~ toTextGlobal(tree.args, ", ") ~ closeThere was a problem hiding this comment.
I pushed this refactoring of the code
| @@ -320,7 +324,8 @@ class RefinedPrinter(_ctx: Context) extends PlainPrinter(_ctx) { | |||
| if (name.isTypeName) typeText(txt) | |||
| else txt | |||
| case tree @ Select(qual, name) => | |||
| if (tree.hasType && tree.symbol == defn.QuotedExpr_~ || tree.symbol == defn.QuotedType_~) keywordStr("~(") ~ toTextLocal(qual) ~ keywordStr(")") | |||
| if (tree.hasType && tree.symbol == defn.QuotedExpr_~) keywordStr("~(") ~ toTextLocal(qual) ~ keywordStr(")") | |||
| else if (tree.hasType && tree.symbol == defn.QuotedType_~) typeText("~(") ~ toTextLocal(qual) ~ typeText(")") | |||
There was a problem hiding this comment.
Why typeText instead if keywordStr? (I don't know enough about the syntax highlighting stuff to be able to tell).
There was a problem hiding this comment.
It looks like this:
I added it because in some large examples it was easyer to see which where types splices and which where terms splices.
compiler/src/dotty/tools/dotc/transform/TreeMapWithStages.scala
Outdated
Show resolved
Hide resolved
compiler/src/dotty/tools/dotc/transform/TreeMapWithStages.scala
Outdated
Show resolved
Hide resolved
nicolasstucki
force-pushed
the
split-staging-2
branch
from
2082ba0 to
88d42d5
Compare
Split current `Staging` into `Staging` and `ReifyQuotes`
- `Staging`
- Just before `Pickler`
- Checks PCP
- Heals phase consistency by replacing `T` with `~implicitly[Type[T]]({{t}})` (actually `~t`)
- Expand macros
- Ycheck that PCP holds (without healing) until `ReifyQuotes`
- `ReifyQuotes`
- Aliases all type splices by replacing `~t` by `T$1` and inserting `type T$1 = ~t` at the start of the quoted block.
- Transform `'{ ... ~(... ) ... }` into `unpickle('{ ... Hole(...) ... }, List(args => ....))`
- `TreeMapWithStages` a new `TreeMap` that contains the logic to track quotation levels while mapping the tree.
- Moved logic from `MacroTransformWithImplicits` to `TreeMapWithImplicits` to be able to tranform a tree without the need to be in a macro transform. This will be useful to integrate the PCP checks and macro expansion in `Typer`.
nicolasstucki
force-pushed
the
split-staging-2
branch
from
58f1347 to
bef8cce
Compare
|
Rebased |
|
@nicolasstucki Which commits did you add after my last review? |
odersky
approved these changes
Feb 14, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Split current
StagingintoStagingandReifyQuotesStagingPicklerTwith~implicitly[Type[T]]({{t}})(actually~t)ReifyQuotesReifyQuotes~tbyT$1and insertingtype T$1 = ~tat the start of the quoted block.'{ ... ~(...) ... }intounpickle('{ ... Hole(...) ... }, List(args => ....))TreeMapWithStagesa newTreeMapthat contains the logic to track quotation levels while mapping the tree.MacroTransformWithImplicitstoTreeMapWithImplicitsto be able to tranform a tree without the need to be in a macro transform. This will be useful to integrate the PCP checks and macro expansion inTyper.