Add type argument encoding to SPLICEPATTERN

Future proof for scala#18271.
dotty-staging · Apr 22, 2024 · 743cc0b · 743cc0b
1 parent 31fe897
commit 743cc0b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/compiler/src/dotty/tools/dotc/core/tasty/TreePickler.scala b/compiler/src/dotty/tools/dotc/core/tasty/TreePickler.scala
@@ -725,10 +725,14 @@ class TreePickler(pickler: TastyPickler, attributes: Attributes) {
             bindings.foreach(pickleTree)
           }
         case SplicePattern(pat, args) =>
+          val targs = Nil // SplicePattern `targs` will be added with #18271
           writeByte(SPLICEPATTERN)
           withLength {
             pickleTree(pat)
             pickleType(tree.tpe)
+            for targ <- targs do
+              writeByte(EXPLICITtpt)
+              pickleTree(targ)
             args.foreach(pickleTree)
           }
         case Hole(_, idx, args, _) =>

diff --git a/compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala b/compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala
@@ -1566,7 +1566,8 @@ class TreeUnpickler(reader: TastyReader,
             case SPLICEPATTERN =>
               val pat = readTree()
               val patType = readType()
-              val args = until(end)(readTree())
+              val (targs, args) = until(end)(readTree()).span(_.isType)
+              assert(targs.isEmpty, "unexpected type arguments in SPLICEPATTERN") // `targs` will be needed for #18271. Until this fearure is added they should be empty.
               SplicePattern(pat, args, patType)
             case HOLE =>
               readHole(end, isTerm = true)

diff --git a/tasty/src/dotty/tools/tasty/TastyFormat.scala b/tasty/src/dotty/tools/tasty/TastyFormat.scala
@@ -112,7 +112,7 @@ Standard-Section: "ASTs" TopLevelStat*
                   SELECTouter    Length levels_Nat qual_Term underlying_Type       -- Follow `levels` outer links, starting from `qual`, with given `underlying` type
                   QUOTE          Length body_Term bodyTpe_Type                     -- Quoted expression `'{ body }` of a body typed as `bodyTpe`
                   SPLICE         Length expr_Term tpe_Type                         -- Spliced expression `${ expr }` typed as `tpe`
-                  SPLICEPATTEN   Length pat_Term tpe_Type args_Term*               -- Pattern splice `${pat}` or `$pat(args*)` in a quoted pattern of type `tpe`
+                  SPLICEPATTEN   Length pat_Term tpe_Type targs_Type* args_Term*   -- Pattern splice `${pat}` or `$pat[targs*](args*)` in a quoted pattern of type `tpe`.
     -- patterns:
                   BIND           Length boundName_NameRef patType_Type pat_Term    -- name @ pat, wherev `patType` is the type of the bound symbol
                   ALTERNATIVE    Length alt_Term*                                  -- alt1 | ... | altn   as a pattern