Refactor

Author: nicolasstucki

compiler/src/dotty/tools/dotc/classpath/AggregateClassPath.scala

@@ -131,12 +131,11 @@ case class AggregateClassPath(aggregates: Seq[ClassPath]) extends ClassPath {
             mergedEntries(index) = BinaryAndSourceFilesEntry(existing, entry)
           case (entry: BinaryFileEntry, existing: SourceFileEntry) =>
             mergedEntries(index) = BinaryAndSourceFilesEntry(entry, existing)
-          case (entry @ TastyFileEntry(_, None), _: ClassFileEntry) =>
+          case (entry: StandaloneTastyFileEntry, _: ClassFileEntry) =>
+            // Here we do not create a TastyFileEntry(entry.file) because the TASTy and the classfile
+            // come from different classpaths. These may not have the same TASTy UUID.
             mergedEntries(index) = entry
-            // Here we do not create a TastyFileEntry(entry.file, existing.source.get)
-            // because the TASTy and the the classfile come from different classpaths.
-            // These may not have the same TASTy UUID.
-          case (entry @ TastyFileEntry(_, None), BinaryAndSourceFilesEntry(_: ClassFileEntry, sourceEntry)) =>
+          case (entry: StandaloneTastyFileEntry, BinaryAndSourceFilesEntry(_: ClassFileEntry, sourceEntry)) =>
             mergedEntries(index) = BinaryAndSourceFilesEntry(entry, sourceEntry)
           case _ =>
       }

compiler/src/dotty/tools/dotc/classpath/ClassPath.scala

@@ -50,28 +50,35 @@ sealed trait BinaryFileEntry extends ClassRepresentation {
 
 /** A classfile or .sig that does not have an associated TASTy file */
 private[dotty] final case class ClassFileEntry(file: AbstractFile) extends BinaryFileEntry {
-  def classfile: Option[AbstractFile] = Some(file)
-  def tasty: Option[AbstractFile] = None
+  def binary: Option[AbstractFile] = Some(file)
 }
 
-/** A TASTy file that may have an associated TASTy */
-private[dotty] final case class TastyFileEntry(file: AbstractFile, classfile: Option[AbstractFile]) extends BinaryFileEntry {
-  def tasty: Option[AbstractFile] = Some(file)
+// object TastyFileEntry:
+//   def apply(file: AbstractFile, hasClassfile: Boolean): BinaryFileEntry =
+//     if hasClassfile then TastyFileEntry(file)
+//     else StandaloneTastyFileEntry(file)
+
+/** A TASTy file that has an associated TASTy */
+private[dotty] final case class TastyFileEntry(file: AbstractFile) extends BinaryFileEntry {
+  def binary: Option[AbstractFile] = Some(file)
+}
+
+/** A TASTy file that does not have an associated TASTy */
+private[dotty] final case class StandaloneTastyFileEntry(file: AbstractFile) extends BinaryFileEntry {
+  def binary: Option[AbstractFile] = Some(file)
 }
 
 private[dotty] final case class SourceFileEntry(file: AbstractFile) extends ClassRepresentation {
   final def fileName: String = file.name
   def name: String = FileUtils.stripSourceExtension(file.name)
-  def classfile: Option[AbstractFile] = None
-  def tasty: Option[AbstractFile] = None
+  def binary: Option[AbstractFile] = None
   def source: Option[AbstractFile] = Some(file)
 }
 
 private[dotty] final case class BinaryAndSourceFilesEntry(binaryEntry: BinaryFileEntry, sourceEntry: SourceFileEntry) extends ClassRepresentation {
   final def fileName: String = binaryEntry.fileName
   def name: String = binaryEntry.name
-  def classfile: Option[AbstractFile] = binaryEntry.classfile
-  def tasty: Option[AbstractFile] = binaryEntry.tasty
+  def binary: Option[AbstractFile] = binaryEntry.binary
   def source: Option[AbstractFile] = sourceEntry.source
 }
 

compiler/src/dotty/tools/dotc/classpath/DirectoryClassPath.scala

@@ -277,7 +277,8 @@ case class DirectoryClassPath(dir: JFile) extends JFileDirectoryLookup[BinaryFil
   override def findClass(className: String): Option[ClassRepresentation] =
     val classfile = findClassFile(className)
     findTastyFile(className) match
-      case Some(file) => Some(TastyFileEntry(file, classfile))
+      case Some(file) =>
+        Some(if classfile.isDefined then TastyFileEntry(file) else StandaloneTastyFileEntry(file))
       case None => classfile.map(ClassFileEntry(_))
 
   def findClassFile(className: String): Option[AbstractFile] = {
@@ -295,8 +296,9 @@ case class DirectoryClassPath(dir: JFile) extends JFileDirectoryLookup[BinaryFil
   }
 
   protected def createFileEntry(file: AbstractFile): BinaryFileEntry =
-    if file.isTasty then TastyFileEntry(file, Option(file.resolveSiblingWithExtension("class")))
-    else ClassFileEntry(file)
+    if !file.isTasty then ClassFileEntry(file)
+    else if file.resolveSiblingWithExtension("class") != null then TastyFileEntry(file)
+    else StandaloneTastyFileEntry(file)
 
   protected def isMatchingFile(f: JFile): Boolean =
     f.isTasty || (f.isClass && f.classToTasty.isEmpty)

compiler/src/dotty/tools/dotc/classpath/VirtualDirectoryClassPath.scala

@@ -45,9 +45,12 @@ case class VirtualDirectoryClassPath(dir: VirtualDirectory) extends ClassPath wi
     else
       val classfile = lookupPath(parentDir)(pathSeq.last + ".class" :: Nil, directory = false)
       val tasty = lookupPath(parentDir)(pathSeq.last + ".tasty" :: Nil, directory = false)
-      if tasty != null then Some(TastyFileEntry(tasty, Option(classfile)))
-      else if classfile != null then Some(ClassFileEntry(classfile))
-      else None
+      if tasty != null then
+        if classfile != null then Some(TastyFileEntry(tasty))
+        else Some(StandaloneTastyFileEntry(tasty))
+      else
+        if classfile != null then Some(ClassFileEntry(classfile))
+        else None
 
   def findClassFile(className: String): Option[AbstractFile] = {
     val pathSeq = FileUtils.dirPath(className).split(java.io.File.separator)
@@ -59,8 +62,9 @@ case class VirtualDirectoryClassPath(dir: VirtualDirectory) extends ClassPath wi
   private[dotty] def classes(inPackage: PackageName): Seq[BinaryFileEntry] = files(inPackage)
 
   protected def createFileEntry(file: AbstractFile): BinaryFileEntry =
-    if file.isTasty then TastyFileEntry(file, Option(file.resolveSiblingWithExtension("class")))
-    else ClassFileEntry(file)
+    if !file.isTasty then ClassFileEntry(file)
+    else if file.resolveSiblingWithExtension("class") != null then TastyFileEntry(file)
+    else StandaloneTastyFileEntry(file)
 
   protected def isMatchingFile(f: AbstractFile): Boolean =
     f.isTasty || (f.isClass && f.classToTasty.isEmpty)

compiler/src/dotty/tools/dotc/classpath/ZipAndJarFileLookupFactory.scala

@@ -51,17 +51,15 @@ object ZipAndJarClassPathFactory extends ZipAndJarFileLookupFactory {
     override def findClass(className: String): Option[BinaryFileEntry] = {
       val (pkg, simpleClassName) = PackageNameUtils.separatePkgAndClassNames(className)
       val binaries = files(PackageName(pkg), simpleClassName + ".tasty", simpleClassName + ".class")
-      val classfile = binaries.find(_.classfile.isDefined).flatMap(_.classfile)
-      binaries.find(_.tasty.isDefined).flatMap(_.tasty) match
-        case Some(file) => Some(TastyFileEntry(file, classfile))
-        case None => classfile.map(ClassFileEntry(_))
+      binaries.find(_.binary.isDefined)
     }
 
     override private[dotty] def classes(inPackage: PackageName): Seq[BinaryFileEntry] = files(inPackage)
 
     override protected def createFileEntry(file: FileZipArchive#Entry): BinaryFileEntry =
-      if file.isTasty then TastyFileEntry(file, Option(file.resolveSiblingWithExtension("class")))
-      else ClassFileEntry(file)
+      if !file.isTasty then  ClassFileEntry(file)
+      else if file.resolveSiblingWithExtension("class") != null then TastyFileEntry(file)
+      else StandaloneTastyFileEntry(file)
 
     override protected def isRequiredFileType(file: AbstractFile): Boolean =
       file.isTasty || (file.isClass && file.classToTasty.isEmpty)

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

@@ -189,7 +189,7 @@ object SymbolLoaders {
   /** Initialize toplevel class and module symbols in `owner` from class path representation `classRep`
    */
   def initializeFromClassPath(owner: Symbol, classRep: ClassRepresentation)(using Context): Unit =
-    ((classRep.tasty.orElse(classRep.classfile), classRep.source): @unchecked) match {
+    ((classRep.binary, classRep.source): @unchecked) match {
       case (Some(bin), Some(src)) if needCompile(bin, src) && !binaryOnly(owner, nameOf(classRep)) =>
         if (ctx.settings.verbose.value) report.inform("[symloader] picked up newer source file for " + src.path)
         enterToplevelsFromSource(owner, nameOf(classRep), src)

compiler/src/dotty/tools/io/ClassPath.scala

@@ -200,8 +200,7 @@ object ClassPath {
 trait ClassRepresentation {
   def fileName: String
   def name: String
-  def classfile: Option[AbstractFile]
-  def tasty: Option[AbstractFile]
+  def binary: Option[AbstractFile]
   def source: Option[AbstractFile]
 
   /** returns the length of `name` by stripping the extension of `fileName`