refector

Author: nicolasstucki

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

@@ -115,6 +115,8 @@ case class AggregateClassPath(aggregates: Seq[ClassPath]) extends ClassPath {
    *  having the TASTy in a later classpath entry.
    */
   private def mergeClassesAndSources(entries: scala.collection.Seq[ClassRepresentation]): Seq[ClassRepresentation] = {
+    def onlyClassEntry(entry: ClassRepresentation): Boolean = !entry.tasty.isDefined && entry.classfile.isDefined
+    def onlyTastyEntry(entry: ClassRepresentation): Boolean = !entry.classfile.isDefined && entry.tasty.isDefined
     // based on the implementation from MergedClassPath
     var count = 0
     val indices = util.HashMap[String, Int]()
@@ -126,19 +128,16 @@ case class AggregateClassPath(aggregates: Seq[ClassPath]) extends ClassPath {
       if (indices.contains(name)) {
         val index = indices(name)
         val existing = mergedEntries(index)
-
-        if !existing.binary.isDefined && entry.binary.isDefined then
-          mergedEntries(index) = BinaryAndSourceFilesEntry(entry, existing)
-        else if
-          existing.classfile.isDefined && !existing.tasty.isDefined
-          && !entry.classfile.isDefined && entry.tasty.isDefined
-        then
-          mergedEntries(index) = existing.source match
-            case Some(source) => BinaryAndSourceFilesEntry(entry, existing)
-            case None => entry
-
-        if (existing.source.isEmpty && entry.source.isDefined)
-          mergedEntries(index) = BinaryAndSourceFilesEntry(existing, entry)
+        (entry, existing) match
+          case (entry: SourceFileEntry, existing: BinaryFileEntry) =>
+            mergedEntries(index) = BinaryAndSourceFilesEntry(existing, entry)
+          case (entry: BinaryFileEntry, existing: SourceFileEntry) =>
+            mergedEntries(index) = BinaryAndSourceFilesEntry(entry, existing)
+          case (entry: BinaryFileEntry, existing: BinaryFileEntry) if onlyClassEntry(existing) && onlyTastyEntry(entry) =>
+            mergedEntries(index) = entry
+          case (entry: BinaryFileEntry, existing: BinaryAndSourceFilesEntry) if onlyClassEntry(existing) && onlyTastyEntry(entry) =>
+            mergedEntries(index) = BinaryAndSourceFilesEntry(entry, existing.sourceEntry)
+          case _ =>
       }
       else {
         indices(name) = count

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

@@ -16,7 +16,9 @@ object ClassPathEntries {
 
 trait BinaryFileEntry extends ClassRepresentation {
   def file: AbstractFile
-  def binary: Option[AbstractFile] = Some(file)
+  final def fileName: String = file.name
+  final def name: String = FileUtils.stripClassExtension(file.name) // class name
+  final def source: Option[AbstractFile] = None
 }
 
 case class PackageName(dottedString: String) {
@@ -46,36 +48,25 @@ trait PackageEntry {
 }
 
 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 SourceFileEntry(file: AbstractFile) extends ClassRepresentation {
   final def fileName: String = file.name
   def name: String = FileUtils.stripSourceExtension(file.name)
-  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 BinaryAndSourceFilesEntry(binaryEntry: ClassRepresentation, sourceEntry: ClassRepresentation) extends ClassRepresentation {
-  // TODO set these types in constructor
-  assert(binaryEntry.isInstanceOf[BinaryFileEntry])
-  assert(sourceEntry.isInstanceOf[SourceFileEntry])
+private[dotty] case class BinaryAndSourceFilesEntry(binaryEntry: BinaryFileEntry, sourceEntry: SourceFileEntry) extends ClassRepresentation {
   final def fileName: String = binaryEntry.fileName
   def name: String = binaryEntry.name
-  def binary: Option[AbstractFile] = binaryEntry.binary
   def classfile: Option[AbstractFile] = binaryEntry.classfile
   def tasty: Option[AbstractFile] = binaryEntry.tasty
   def source: Option[AbstractFile] = sourceEntry.source

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.binary, classRep.source): @unchecked) match {
+    ((classRep.tasty.orElse(classRep.classfile), 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,7 +200,6 @@ object ClassPath {
 trait ClassRepresentation {
   def fileName: String
   def name: String
-  def binary: Option[AbstractFile]
   def classfile: Option[AbstractFile]
   def tasty: Option[AbstractFile]
   def source: Option[AbstractFile]