Tasty: Have a tpt form for Apply as well as TypeApply

Needed to accurately reflect parameterized type applications.
We now use APPLYtpt/TYPEAPPLYtpt instead of APPLIEDtpt.

Author: odersky

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

@@ -104,7 +104,8 @@ Standard-Section: "ASTs" TopLevelStat*
                   SELECTtpt             NameRef qual_Term
                   SINGLETONtpt          ref_Term
                   REFINEDtpt     Length underlying_Term refinement_Stat*
-                  APPLIEDtpt     Length tycon_Term arg_Term*
+                  APPLYtpt       Length tycon_Term arg_Term*
+                  TYPEAPPLYtpt   Length tycon_Term arg_Term*
                   POLYtpt        Length TypeParam* body_Term
                   TYPEBOUNDStpt  Length low_Term high_Term?
                   ANNOTATEDtpt   Length underlying_Term fullAnnotation_Term
@@ -247,7 +248,7 @@ Standard Section: "Comments" Comment*
 object TastyFormat {
 
   final val header = Array(0x5C, 0xA1, 0xAB, 0x1F)
-  val MajorVersion = 9
+  val MajorVersion = 10
   val MinorVersion = 0
 
   /** Tags used to serialize names */
@@ -409,7 +410,7 @@ object TastyFormat {
   final val REFINEDtype = 158
   final val REFINEDtpt = 159
   final val APPLIEDtype = 160
-  final val APPLIEDtpt = 161
+  final val TYPEAPPLYtpt = 161
   final val TYPEBOUNDS = 162
   final val TYPEBOUNDStpt = 163
   final val ANDtype = 164
@@ -423,7 +424,7 @@ object TastyFormat {
   final val ANNOTATION = 172
   final val TERMREFin = 173
   final val TYPEREFin = 174
-  final val OBJECTDEF = 175
+  final val APPLYtpt = 175
 
   // In binary: 101100EI
   // I = implicit method type
@@ -432,6 +433,7 @@ object TastyFormat {
   final val IMPLICITMETHODtype = 177
   final val ERASEDMETHODtype = 178
   final val ERASEDIMPLICITMETHODtype = 179
+  final val OBJECTDEF = 180
 
   final val UNTYPEDSPLICE = 199
 
@@ -507,15 +509,15 @@ object TastyFormat {
        | SELECTtpt
        | SINGLETONtpt
        | REFINEDtpt
-       | APPLIEDtpt
+       | APPLYtpt
+       | TYPEAPPLYtpt
        | LAMBDAtpt
        | TYPEBOUNDStpt
        | ANNOTATEDtpt
        | ANDtpt
        | ORtpt
        | BYNAMEtpt
-       | BIND
-       | APPLY => true
+       | BIND => true
     case _ => false
   }
 
@@ -632,7 +634,8 @@ object TastyFormat {
     case REFINEDtype => "REFINEDtype"
     case REFINEDtpt => "REFINEDtpt"
     case APPLIEDtype => "APPLIEDtype"
-    case APPLIEDtpt => "APPLIEDtpt"
+    case APPLYtpt => "APPLYtpt"
+    case TYPEAPPLYtpt => "TYPEAPPLYtpt"
     case TYPEBOUNDS => "TYPEBOUNDS"
     case TYPEBOUNDStpt => "TYPEBOUNDStpt"
     case TYPEALIAS => "TYPEALIAS"

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

@@ -365,14 +365,14 @@ class TreePickler(pickler: TastyPickler) {
             writeByte(THROW)
             pickleTree(args.head)
           } else {
-            writeByte(APPLY)
+            writeByte(if (tree.isType) APPLYtpt else APPLY)
             withLength {
               pickleTree(fun)
               args.foreach(pickleTree)
             }
           }
         case TypeApply(fun, args) =>
-          writeByte(TYPEAPPLY)
+          writeByte(if (tree.isType) TYPEAPPLYtpt else TYPEAPPLY)
           withLength {
             pickleTree(fun)
             args.foreach(pickleTpt)
@@ -524,7 +524,7 @@ class TreePickler(pickler: TastyPickler) {
             withLength { pickleTree(parent); refinements.foreach(pickleTree) }
           }
         case AppliedTypeTree(tycon, args) =>
-          writeByte(APPLIEDtpt)
+          writeByte(TYPEAPPLYtpt)
           withLength { pickleTree(tycon); args.foreach(pickleTree) }
         case AndTypeTree(tp1, tp2) =>
           writeByte(ANDtpt)
@@ -819,7 +819,7 @@ class TreePickler(pickler: TastyPickler) {
         writeByte(REFINEDtpt)
         withLength { pickleTpt(parent); refinements.foreach(pickleTerm) }
       case AppliedTypeTree(tycon, args) =>
-        writeByte(APPLIEDtpt)
+        writeByte(TYPEAPPLYtpt)
         withLength { pickleTpt(tycon); args.foreach(pickleTpt) }
       case AndTypeTree(tp1, tp2) =>
         writeByte(ANDtpt)

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

@@ -1123,7 +1123,9 @@ class TreeUnpickler(reader: TastyReader,
               val parent = readTpt()
               val refinements = readStats(refineCls, end)(localContext(refineCls))
               RefinedTypeTree(parent, refinements, refineCls)
-            case APPLIEDtpt =>
+            case APPLYtpt =>
+              tpd.Apply(readTpt(), until(end)(readTerm()))
+            case TYPEAPPLYtpt =>
               // If we do directly a tpd.AppliedType tree we might get a
               // wrong number of arguments in some scenarios reading F-bounded
               // types. This came up in #137 of collection strawman.
@@ -1374,7 +1376,7 @@ class TreeUnpickler(reader: TastyReader,
             untpd.Import(readUntyped(), readSelectors())
           case REFINEDtpt =>
             untpd.RefinedTypeTree(readUntyped(), until(end)(readUntyped()))
-          case APPLIEDtpt =>
+          case TYPEAPPLYtpt =>
             untpd.AppliedTypeTree(readUntyped(), until(end)(readUntyped()))
           case ANDtpt =>
             untpd.AndTypeTree(readUntyped(), readUntyped())