Skip to content

Commit 3ece9d5

Browse files
committed
Fix windows bootstrap
1 parent 19e6f77 commit 3ece9d5

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

Diff for: compiler/src/dotty/tools/dotc/classpath/ClassPath.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ trait SourceFileEntry extends ClassRepresentation {
2424

2525
case class PackageName(dottedString: String) {
2626
def isRoot: Boolean = dottedString.isEmpty
27-
val dirPathTrailingSlash: String = FileUtils.dirPath(dottedString) + "/"
27+
val dirPathTrailingSlash: String = FileUtils.dirPathInArchive(dottedString) + "/"
2828

2929
def entryName(entry: String): String = {
3030
if (isRoot) entry else {

Diff for: compiler/src/dotty/tools/dotc/classpath/FileUtils.scala

+2
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ object FileUtils {
4444

4545
def dirPath(forPackage: String): String = forPackage.replace('.', JFile.separatorChar)
4646

47+
def dirPathInArchive(forPackage: String): String = forPackage.replace('.', '/')
48+
4749
def endsClass(fileName: String): Boolean =
4850
fileName.length > 6 && fileName.substring(fileName.length - 6) == ".class"
4951

Diff for: compiler/src/dotty/tools/dotc/core/SymbolLoaders.scala

+1-2
Original file line numberDiff line numberDiff line change
@@ -209,8 +209,7 @@ object SymbolLoaders {
209209

210210
/** Load contents of a package
211211
*/
212-
class PackageLoader(_sourceModule: TermSymbol, classPath: ClassPath)
213-
extends SymbolLoader {
212+
class PackageLoader(_sourceModule: TermSymbol, classPath: ClassPath) extends SymbolLoader {
214213
override def sourceFileOrNull: AbstractFile = null
215214
override def sourceModule(using Context): TermSymbol = _sourceModule
216215
def description(using Context): String = "package loader " + sourceModule.fullName

0 commit comments

Comments
 (0)