Skip to content

Add TASTY pickling of quotes and implement ~ on quotes #3662

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 18 commits into from
Jan 8, 2018
Merged

Add TASTY pickling of quotes and implement ~ on quotes #3662

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
86939bb
Avoid running sepparate compilation tests under legacy tests
nicolasstucki Dec 14, 2017
f021562
Rename quote test files
nicolasstucki Dec 20, 2017
ddb4449
Add TASTY quote pickling for trees
nicolasstucki Dec 5, 2017
c40a022
Fix bug while unpickling splices in quotes
nicolasstucki Dec 21, 2017
c80ea20
Implement primitive liftable
nicolasstucki Dec 22, 2017
1674cd8
Add String to Liftable expressions and abstract over all primitives
nicolasstucki Dec 22, 2017
10753bc
Re-enable valueTypeNameToJavaType
nicolasstucki Dec 28, 2017
a15fc90
Disable spourious `containsQuotesOrSplices = true`
nicolasstucki Dec 28, 2017
e4c2a33
Rename QuoteUnpickler to TastyUnpickler
nicolasstucki Dec 28, 2017
29ef05d
Add comments to `RawQuote`s
nicolasstucki Dec 28, 2017
65acf1c
Replace `PrimitiveExpr`s by the sinlge class `ConstantExpr`
nicolasstucki Dec 28, 2017
2ff30d6
Avoid printing encoded TASTY in `TastyExpr` and `TastyType`
nicolasstucki Dec 28, 2017
2bd3b6f
Simplify `RawQuoted` instantiations
nicolasstucki Dec 28, 2017
990e3d1
Implement extractor for quoted trees
nicolasstucki Dec 28, 2017
2aa05ef
Re-work Interpreter
nicolasstucki Dec 28, 2017
8b94c86
Move quote unpickling to the core package
nicolasstucki Dec 28, 2017
82d36bd
Encapsulate quoted types in top level `type`
nicolasstucki Dec 28, 2017
f86bcc5
Add environment to the interpreter
nicolasstucki Dec 28, 2017
File filter

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
Move quote unpickling to the core package
  • Loading branch information
@nicolasstucki
nicolasstucki committed Jan 8, 2018
commit 8b94c86a1382f4799b5ed9c8951fe301a7a432ec
6 changes: 3 additions & 3 deletions ...tty/tools/dotc/quoted/PickledQuotes.scala → ...ools/dotc/core/quoted/PickledQuotes.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package dotty.tools.dotc.quoted
package dotty.tools.dotc.core.quoted

import dotty.tools.dotc.ast.Trees._
import dotty.tools.dotc.ast.tpd
Expand All @@ -8,7 +8,7 @@ import dotty.tools.dotc.core.Contexts._
import dotty.tools.dotc.core.Decorators._
import dotty.tools.dotc.core.Flags._
import dotty.tools.dotc.core.Symbols._
import dotty.tools.dotc.core.tasty._
import dotty.tools.dotc.core.tasty.{TastyPickler, TastyPrinter, TastyString}
import dotty.tools.dotc.interpreter.RawQuoted

object PickledQuotes {
Expand Down Expand Up @@ -79,7 +79,7 @@ object PickledQuotes {

/** Unpickle TASTY bytes into it's tree */
private def unpickle(bytes: Array[Byte], splices: Seq[Any])(implicit ctx: Context): Tree = {
val unpickler = new dotty.tools.dotc.quoted.TastyUnpickler(bytes, splices)
val unpickler = new TastyUnpickler(bytes, splices)
unpickler.enter(roots = Set(defn.RootPackage))
val tree = unpickler.body.head
if (pickling ne noPrinter) {
Expand Down
2 changes: 1 addition & 1 deletion .../src/dotty/tools/dotc/quoted/Quoted.scala → ...dotty/tools/dotc/core/quoted/Quoted.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package dotty.tools.dotc.quoted
package dotty.tools.dotc.core.quoted

import dotty.tools.dotc.ast.Trees.GenericApply
import dotty.tools.dotc.ast.tpd
Expand Down
2 changes: 1 addition & 1 deletion ...ty/tools/dotc/quoted/TastyUnpickler.scala → ...ols/dotc/core/quoted/TastyUnpickler.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package dotty.tools.dotc.quoted
package dotty.tools.dotc.core.quoted

import dotty.tools.dotc.core.tasty._
import dotty.tools.dotc.core.tasty.TastyUnpickler.NameTable
Expand Down
2 changes: 1 addition & 1 deletion compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import scala.collection.{ mutable, immutable }
import config.Printers.pickling
import typer.Checking
import config.Config
import dotty.tools.dotc.quoted.PickledQuotes
import dotty.tools.dotc.core.quoted.PickledQuotes
import dotty.tools.dotc.interpreter.RawQuoted
import scala.quoted.Expr

Expand Down
2 changes: 1 addition & 1 deletion compiler/src/dotty/tools/dotc/interpreter/Interpreter.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.Contexts._
import dotty.tools.dotc.core.Decorators._
import dotty.tools.dotc.core.Names._
import dotty.tools.dotc.core.Symbols._
import dotty.tools.dotc.quoted.Quoted
import dotty.tools.dotc.core.quoted.Quoted
import dotty.tools.dotc.util.Positions.Position

import scala.reflect.ClassTag
Expand Down
3 changes: 1 addition & 2 deletions compiler/src/dotty/tools/dotc/transform/ReifyQuotes.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ import NameKinds.OuterSelectName

import scala.collection.mutable
import dotty.tools.dotc.core.StdNames._
import dotty.tools.dotc.quoted.PickledQuotes
import dotty.tools.dotc.quoted.Quoted
import dotty.tools.dotc.core.quoted._


/** Translates quoted terms and types to `unpickle` method calls.
Expand Down
9 changes: 2 additions & 7 deletions compiler/src/dotty/tools/dotc/transform/Splicer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,10 @@
package dotty.tools.dotc
package transform

import dotty.tools.dotc.core.Contexts._
import dotty.tools.dotc.core.Symbols._
import dotty.tools.dotc.ast.Trees._
import dotty.tools.dotc.ast.tpd
import dotty.tools.dotc.core.Contexts._
import dotty.tools.dotc.core.quoted._
import dotty.tools.dotc.interpreter._
import dotty.tools.dotc.quoted.PickledQuotes
import dotty.tools.dotc.quoted.Quoted

import scala.quoted

/** Utility class to slice quoted expressions */
object Splicer {
Expand Down