Skip to content

Commit bfa631a

Browse files
committed
Remove QuoteUnpickler and use DottyUnpickler
Without the splices `QuoteUnpickler` is just a copy of the `DottyUnpickler`.
1 parent a296199 commit bfa631a

File tree

4 files changed

+4
-32
lines changed

4 files changed

+4
-32
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import dotty.tools.dotc.core.Symbols._
1313
import dotty.tools.dotc.core.Types._
1414
import dotty.tools.dotc.core.tasty.TreePickler.Hole
1515
import dotty.tools.dotc.core.tasty.{ PositionPickler, TastyPickler, TastyPrinter }
16+
import dotty.tools.dotc.core.tasty.DottyUnpickler
1617
import dotty.tools.dotc.core.tasty.TreeUnpickler.UnpickleMode
1718
import dotty.tools.dotc.quoted.QuoteContext
1819
import dotty.tools.dotc.tastyreflect.{ReflectionImpl, TastyTreeExpr, TreeType}
@@ -191,7 +192,7 @@ object PickledQuotes {
191192
quotePickling.println(s"**** unpickling quote from TASTY\n${new TastyPrinter(bytes).printContents()}")
192193

193194
val mode = if (isType) UnpickleMode.TypeTree else UnpickleMode.Term
194-
val unpickler = new QuoteUnpickler(bytes, splices, mode)
195+
val unpickler = new DottyUnpickler(bytes, mode)
195196
unpickler.enter(Set.empty)
196197

197198
val tree = unpickler.tree

compiler/src/dotty/tools/dotc/core/quoted/QuoteUnpickler.scala

Lines changed: 0 additions & 27 deletions
This file was deleted.

compiler/src/dotty/tools/dotc/core/tasty/DottyUnpickler.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ object DottyUnpickler {
2020
class TreeSectionUnpickler(posUnpickler: Option[PositionUnpickler], commentUnpickler: Option[CommentUnpickler])
2121
extends SectionUnpickler[TreeUnpickler](TreePickler.sectionName) {
2222
def unpickle(reader: TastyReader, nameAtRef: NameTable): TreeUnpickler =
23-
new TreeUnpickler(reader, nameAtRef, posUnpickler, commentUnpickler, Seq.empty)
23+
new TreeUnpickler(reader, nameAtRef, posUnpickler, commentUnpickler)
2424
}
2525

2626
class PositionsSectionUnpickler extends SectionUnpickler[PositionUnpickler]("Positions") {

compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,11 @@ import scala.annotation.internal.sharable
4747
* @param reader the reader from which to unpickle
4848
* @param posUnpicklerOpt the unpickler for positions, if it exists
4949
* @param commentUnpicklerOpt the unpickler for comments, if it exists
50-
* @param splices
5150
*/
5251
class TreeUnpickler(reader: TastyReader,
5352
nameAtRef: NameRef => TermName,
5453
posUnpicklerOpt: Option[PositionUnpickler],
55-
commentUnpicklerOpt: Option[CommentUnpickler],
56-
splices: Seq[Any]) {
54+
commentUnpicklerOpt: Option[CommentUnpickler]) {
5755
import TreeUnpickler._
5856
import tpd._
5957

0 commit comments

Comments
 (0)