rename to ImportOrExport, add ExportType

Author: bishabosha

compiler/src/dotty/tools/dotc/ast/Trees.scala

@@ -794,9 +794,9 @@ object Trees {
   }
 
 
-  abstract class GenericImport[-T >: Untyped](implicit @constructorOnly src: SourceFile)
+  abstract class ImportOrExport[-T >: Untyped](implicit @constructorOnly src: SourceFile)
     extends DenotingTree[T] {
-    type ThisTree[-T >: Untyped] <: GenericImport[T]
+    type ThisTree[-T >: Untyped] <: ImportOrExport[T]
     val expr: Tree[T]
     val selectors: List[untpd.ImportSelector]
   }
@@ -806,7 +806,7 @@ object Trees {
    *  an untyped thicket consisting of `name` and `rename`.
    */
   case class Import[-T >: Untyped] private[ast] (expr: Tree[T], selectors: List[untpd.ImportSelector])(implicit @constructorOnly src: SourceFile)
-    extends GenericImport[T] {
+    extends ImportOrExport[T] {
     type ThisTree[-T >: Untyped] = Import[T]
   }
 
@@ -815,7 +815,7 @@ object Trees {
    *  an untyped thicket consisting of `name` and `rename`.
    */
   case class Export[-T >: Untyped] private[ast] (expr: Tree[T], selectors: List[untpd.ImportSelector])(implicit @constructorOnly src: SourceFile)
-    extends GenericImport[T] {
+    extends ImportOrExport[T] {
       type ThisTree[-T >: Untyped] = Export[T]
   }
 

compiler/src/dotty/tools/dotc/core/Types.scala

@@ -4812,6 +4812,7 @@ object Types {
 
   /** The type of an import clause tree */
   case class ImportType(expr: Tree) extends UncachedGroundType
+  @sharable case object ExportType extends UncachedGroundType
 
   /** Sentinel for "missing type" */
   @sharable case object NoType extends CachedGroundType {

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

@@ -968,9 +968,9 @@ class TreeUnpickler(reader: TastyReader,
       case TYPEDEF | VALDEF | DEFDEF =>
         readIndexedDef()
       case IMPORT =>
-        readImportLike(Import(_, _))()
+        readImportOrExport(Import(_, _))()
       case EXPORT =>
-        readImportLike(Export(_, _))()
+        readImportOrExport(Export(_, _))()
       case PACKAGE =>
         val start = currentAddr
         processPackage { (pid, end) =>
@@ -980,7 +980,8 @@ class TreeUnpickler(reader: TastyReader,
         readTerm()(using ctx.withOwner(exprOwner))
     }
 
-    inline def readImportLike(inline mkTree: (Tree, List[untpd.ImportSelector]) => Tree)()(using Context): Tree = {
+    inline def readImportOrExport(inline mkTree:
+        (Tree, List[untpd.ImportSelector]) => Tree)()(using Context): Tree = {
       val start = currentAddr
       assert(sourcePathAt(start).isEmpty)
       readByte()

compiler/src/dotty/tools/dotc/decompiler/DecompilationPrinter.scala

@@ -43,7 +43,6 @@ class DecompilationPrinter extends Phase {
     if (ctx.settings.printTasty.value)
       println(TastyPrinter.show(unit.pickled.head._2()))
     else {
-      import dotty.tools.dotc.core.Decorators.i
       val unitFile = unit.source.toString.replace("\\", "/").replace(".class", ".tasty")
       out.println(s"/** Decompiled from $unitFile */")
       out.println(QuoteContextImpl.showDecompiledTree(unit.tpdTree))

compiler/src/dotty/tools/dotc/fromtasty/TASTYRun.scala

@@ -7,6 +7,7 @@ import core.Contexts._
 class TASTYRun(comp: Compiler, ictx: Context) extends Run(comp, ictx) {
   override def compile(classNames: List[String]): Unit = {
     val units = classNames.map(new TASTYCompilationUnit(_))
+    println(s"compile units = $units")
     compileUnits(units)
   }
 }

compiler/src/dotty/tools/dotc/transform/FirstTransform.scala

@@ -152,7 +152,7 @@ class FirstTransform extends MiniPhase with InfoTransformer { thisPhase =>
   }
 
   override def transformOther(tree: Tree)(using Context): Tree = tree match {
-    case tree: (GenericImport[_]) => EmptyTree
+    case tree: (ImportOrExport[_]) => EmptyTree
     case tree: NamedArg => transformAllDeep(tree.arg)
     case tree => if (tree.isType) toTypeTree(tree) else tree
   }

compiler/src/dotty/tools/dotc/typer/TypeAssigner.scala

@@ -508,7 +508,7 @@ trait TypeAssigner {
     tree.withType(sym.termRef)
 
   def assignType(tree: untpd.Export)(using Context): Export =
-    tree.withType(ImportType(tree.expr.asInstanceOf[tpd.Tree]))
+    tree.withType(ExportType)
 
   def assignType(tree: untpd.Annotated, arg: Tree, annot: Tree)(using Context): Annotated = {
     assert(tree.isType) // annotating a term is done via a Typed node, can't use Annotate directly

compiler/src/dotty/tools/dotc/typer/Typer.scala

@@ -2235,7 +2235,7 @@ class Typer extends Namer
   def localDummy(cls: ClassSymbol, impl: untpd.Template)(using Context): Symbol =
     newLocalDummy(cls, impl.span)
 
-  inline def typedGenericImport[T <: GenericImport[Untyped]](imp: T)(
+  inline def typedImportOrExport[T <: ImportOrExport[Untyped]](imp: T)(
     inline mkTree: (Tree, List[untpd.ImportSelector]) => imp.ThisTree[Type])(using Context): imp.ThisTree[Type] = {
     val expr1 = typedExpr(imp.expr, AnySelectionProto)
     checkLegalImportPath(expr1)
@@ -2249,13 +2249,13 @@ class Typer extends Namer
   }
 
   def typedImport(imp: untpd.Import, sym: Symbol)(using Context): Import = {
-    typedGenericImport(imp)((expr1, selectors1) =>
+    typedImportOrExport(imp)((expr1, selectors1) =>
       assignType(cpy.Import(imp)(expr1, selectors1), sym)
     )
   }
 
   def typedExport(exp: untpd.Export)(using Context): Export = {
-    typedGenericImport(exp)((expr1, selectors1) =>
+    typedImportOrExport(exp)((expr1, selectors1) =>
       assignType(cpy.Export(exp)(expr1, selectors1))
     )
   }