Refactor BinaryFileEntry

Author: nicolasstucki

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

@@ -130,8 +130,8 @@ case class AggregateClassPath(aggregates: Seq[ClassPath]) extends ClassPath {
         if !existing.binary.isDefined && entry.binary.isDefined then
           mergedEntries(index) = ClassAndSourceFilesEntry(entry, existing.source.get)
         else if
-          existing.classFile.isDefined && !existing.tasty.isDefined
-          && !entry.classFile.isDefined && entry.tasty.isDefined
+          existing.classfile.isDefined && !existing.tasty.isDefined
+          && !entry.classfile.isDefined && entry.tasty.isDefined
         then
           mergedEntries(index) = existing.source match
             case Some(source) => ClassAndSourceFilesEntry(entry, source)

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

@@ -16,18 +16,22 @@ object ClassPathEntries {
 
 trait BinaryFileEntry extends ClassRepresentation {
   def file: AbstractFile
+  def binary: Option[AbstractFile] = Some(file)
 }
 object BinaryFileEntry {
   def apply(classFile: Option[AbstractFile], tasty: Option[AbstractFile]): BinaryFileEntry =
-    BinaryFileEntryImpl(classFile, tasty)
+    tasty match
+      case Some(tasty) => TastyFileEntry(tasty, classFile)
+      case None => ClassFileEntry(classFile.get)
 
   def apply(file: AbstractFile): BinaryFileEntry =
-    if file.extension == "tasty" then BinaryFileEntryImpl(classFile = None, tasty = Some(file))
-    else BinaryFileEntryImpl(classFile = Some(file), tasty = None)
+    if file.extension == "tasty" then TastyFileEntry(file, None)
+    else ClassFileEntry(file)
 
   def from(classFile: Option[AbstractFile], tasty: Option[AbstractFile]): Option[BinaryFileEntry] =
-    if classFile.isDefined || tasty.isDefined then Some(BinaryFileEntryImpl(classFile, tasty))
-    else None
+    tasty match
+      case Some(file) => Some(TastyFileEntry(file, classFile))
+      case None => classFile.map(ClassFileEntry(_))
 }
 
 trait SourceFileEntry extends ClassRepresentation {
@@ -60,38 +64,40 @@ trait PackageEntry {
   def name: String
 }
 
-private[dotty] case class BinaryFileEntryImpl(classFile: Option[AbstractFile], tasty: Option[AbstractFile]) extends BinaryFileEntry {
-  // TODO remove assertions once all tests pass
-  assert(classFile.isDefined || tasty.isDefined)
-  assert(classFile.map(file => file.`extension` == "class" || file.`extension` == "sig").getOrElse(true), classFile)
-  assert(tasty.map(_.`extension` == "tasty").getOrElse(true), tasty)
-  def file = tasty.getOrElse(classFile.get)
-
+private[dotty] case class ClassFileEntry(file: AbstractFile) extends BinaryFileEntry {
   final def fileName: String = file.name
   def name: String = FileUtils.stripClassExtension(file.name) // class name
+  def classfile: Option[AbstractFile] = Some(file)
+  def tasty: Option[AbstractFile] = None
+  def source: Option[AbstractFile] = None
+}
 
+private[dotty] case class TastyFileEntry(file: AbstractFile, classfile: Option[AbstractFile]) extends BinaryFileEntry {
+  final def fileName: String = file.name
+  def name: String = FileUtils.stripClassExtension(file.name) // class name
+  def tasty: Option[AbstractFile] = Some(file)
   def source: Option[AbstractFile] = None
 }
 
 private[dotty] case class SourceFileEntryImpl(file: AbstractFile) extends SourceFileEntry {
   final def fileName: String = file.name
   def name: String = FileUtils.stripSourceExtension(file.name)
-
-  def classFile: Option[AbstractFile] = None
+  def binary: Option[AbstractFile] = None
+  def classfile: Option[AbstractFile] = None
   def tasty: Option[AbstractFile] = None
   def source: Option[AbstractFile] = Some(file)
 }
 
-private[dotty] case class ClassAndSourceFilesEntry(classFile: Option[AbstractFile], tasty: Option[AbstractFile], srcFile: AbstractFile) extends ClassRepresentation {
-  assert(classFile.isDefined || tasty.isDefined)
-  assert(classFile.map(_.`extension` == "class").getOrElse(true), classFile)
+private[dotty] case class ClassAndSourceFilesEntry(classfile: Option[AbstractFile], tasty: Option[AbstractFile], srcFile: AbstractFile) extends ClassRepresentation {
+  assert(classfile.isDefined || tasty.isDefined)
+  assert(classfile.map(_.`extension` == "class").getOrElse(true), classfile)
   assert(tasty.map(_.`extension` == "tasty").getOrElse(true), tasty)
 
-  private def classfile = tasty.getOrElse(classFile.get)
-
-  final def fileName: String = classfile.name
-  def name: String = FileUtils.stripClassExtension(classfile.name)
+  private def classFile = tasty.getOrElse(classfile.get)
 
+  final def fileName: String = classFile.name
+  def name: String = FileUtils.stripClassExtension(classFile.name)
+  def binary: Option[AbstractFile] = tasty.orElse(classfile)
   def source: Option[AbstractFile] = Some(srcFile)
 }
 
@@ -108,5 +114,5 @@ private[dotty] trait NoClassPaths {
 }
 private[dotty] object ClassAndSourceFilesEntry {
   def apply(binary: ClassRepresentation, source: AbstractFile): ClassRepresentation =
-    ClassAndSourceFilesEntry(binary.classFile, binary.tasty, source)
+    ClassAndSourceFilesEntry(binary.classfile, binary.tasty, source)
 }

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

@@ -52,7 +52,7 @@ object ZipAndJarClassPathFactory extends ZipAndJarFileLookupFactory {
       val (pkg, simpleClassName) = PackageNameUtils.separatePkgAndClassNames(className)
       val binaries = files(PackageName(pkg), simpleClassName + ".tasty", simpleClassName + ".class")
       BinaryFileEntry.from(
-        binaries.find(_.classFile.isDefined).flatMap(_.classFile),
+        binaries.find(_.classfile.isDefined).flatMap(_.classfile),
         binaries.find(_.tasty.isDefined).flatMap(_.tasty),
       )
     }

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

@@ -200,8 +200,8 @@ object ClassPath {
 trait ClassRepresentation {
   def fileName: String
   def name: String
-  def binary: Option[AbstractFile] = tasty.orElse(classFile)
-  def classFile: Option[AbstractFile]
+  def binary: Option[AbstractFile]
+  def classfile: Option[AbstractFile]
   def tasty: Option[AbstractFile]
   def source: Option[AbstractFile]