Skip to content

Commit c291cd3

Browse files
nicolasstuckinicolasstucki
committed
Fix path separator
1 parent 316a096 commit c291cd3

File tree

3 files changed

+31
-31
lines changed

3 files changed

+31
-31
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ class TASTYRun(comp: Compiler, ictx: Context) extends Run(comp, ictx) {
2222
file.extension match
2323
case "jar" =>
2424
JarArchive.open(Path(file.path), create = false).allFileNames()
25-
.map(_.stripPrefix(File.separator)) // change paths from absolute to relative
25+
.map(_.stripPrefix("/")) // change paths from absolute to relative
2626
.filter(e => Path.extension(e) == "tasty" && !fromTastyIgnoreList(e))
27-
.map(e => e.stripSuffix(".tasty").replace(File.separator, "."))
27+
.map(e => e.stripSuffix(".tasty").replace("/", "."))
2828
.toList
2929
case "tasty" => TastyFileUtil.getClassName(file)
3030
case _ =>

‎tests/run-with-compiler/scala2-library-from-tasty-jar.scala

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,16 @@ def dottyVersion =
2121
}.get
2222

2323
def scalaLibJarPath =
24-
s"out/bootstrap/scala2-library-tasty/scala-$dottyVersion-nonbootstrapped/scala2-library-tasty-experimental_3-$dottyVersion.jar"
24+
s"out${separator}bootstrap${separator}scala2-library-tasty${separator}scala-$dottyVersion-nonbootstrapped${separator}scala2-library-tasty-experimental_3-$dottyVersion.jar"
2525

2626
def scalaLibClassesPath =
2727
java.nio.file.Paths.get(
28-
s"out/bootstrap/scala2-library-bootstrapped/scala-$dottyVersion-nonbootstrapped/classes")
28+
s"out${separator}bootstrap${separator}scala2-library-bootstrapped${separator}scala-$dottyVersion-nonbootstrapped${separator}classes")
2929

3030
lazy val scalaLibTastyPaths =
3131
new Directory(scalaLibClassesPath).deepFiles
3232
.filter(_.`extension` == "tasty")
33-
.map(_.normalize.path.stripPrefix(scalaLibClassesPath.toString + "/"))
33+
.map(_.normalize.path.stripPrefix(scalaLibClassesPath.toString + separator))
3434
.toList
3535

3636
def compileFromTastyInJar(blacklisted: Set[String]): Unit = {
@@ -40,7 +40,7 @@ def compileFromTastyInJar(blacklisted: Set[String]): Unit = {
4040
val args = Array(
4141
"-classpath", ClasspathFromClassloader(getClass.getClassLoader),
4242
"-from-tasty",
43-
"-d", "out/scala2-library-from-tasty-jar-test-output.jar",
43+
"-d", s"out${separator}scala2-library-from-tasty-jar-test-output.jar",
4444
"-nowarn",
4545
yFromTastyBlacklist,
4646
scalaLibJarPath,
@@ -58,14 +58,14 @@ def compileBlacklisted = Set[String](
5858
// at dotty.tools.backend.jvm.BCodeHelpers$BCInnerClassGen.getClassBTypeAndRegisterInnerClass$(BCodeHelpers.scala:210)
5959
// at dotty.tools.backend.jvm.BCodeSkelBuilder$PlainSkelBuilder.getClassBTypeAndRegisterInnerClass(BCodeSkelBuilder.scala:62)
6060
// at dotty.tools.backend.jvm.BCodeHelpers$BCInnerClassGen.internalName(BCodeHelpers.scala:237)
61-
"scala/Array.tasty",
62-
"scala/Boolean.tasty",
63-
"scala/Byte.tasty",
64-
"scala/Char.tasty",
65-
"scala/Double.tasty",
66-
"scala/Float.tasty",
67-
"scala/Int.tasty",
68-
"scala/Long.tasty",
69-
"scala/Short.tasty",
70-
"scala/Unit.tasty",
71-
).map(_.replace("/", separator))
61+
s"scala${separator}Array.tasty",
62+
s"scala${separator}Boolean.tasty",
63+
s"scala${separator}Byte.tasty",
64+
s"scala${separator}Char.tasty",
65+
s"scala${separator}Double.tasty",
66+
s"scala${separator}Float.tasty",
67+
s"scala${separator}Int.tasty",
68+
s"scala${separator}Long.tasty",
69+
s"scala${separator}Short.tasty",
70+
s"scala${separator}Unit.tasty",
71+
)

‎tests/run-with-compiler/scala2-library-from-tasty.scala

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ def dottyVersion =
2222

2323
def scalaLibClassesPath =
2424
java.nio.file.Paths.get(
25-
s"out/bootstrap/scala2-library-bootstrapped/scala-$dottyVersion-nonbootstrapped/classes")
25+
s"out${separator}bootstrap${separator}scala2-library-bootstrapped${separator}scala-$dottyVersion-nonbootstrapped${separator}classes")
2626

2727
lazy val scalaLibTastyPaths =
2828
new Directory(scalaLibClassesPath).deepFiles
2929
.filter(_.`extension` == "tasty")
30-
.map(_.normalize.path.stripPrefix(scalaLibClassesPath.toString + "/"))
30+
.map(_.normalize.path.stripPrefix(scalaLibClassesPath.toString + separator))
3131
.toList
3232

3333
def compileFromTasty(blacklisted: Set[String]): Unit = {
@@ -36,7 +36,7 @@ def compileFromTasty(blacklisted: Set[String]): Unit = {
3636
val args = Array(
3737
"-classpath", ClasspathFromClassloader(getClass.getClassLoader),
3838
"-from-tasty",
39-
"-d", "out/scala2-library-from-tasty-test-output.jar",
39+
"-d", s"out${separator}scala2-library-from-tasty-test-output.jar",
4040
"-nowarn",
4141
) ++ tastyFiles.map(x => scalaLibClassesPath.resolve(x).toString)
4242
val reporter = driver.process(args)
@@ -52,14 +52,14 @@ def compileBlacklisted = Set[String](
5252
// at dotty.tools.backend.jvm.BCodeHelpers$BCInnerClassGen.getClassBTypeAndRegisterInnerClass$(BCodeHelpers.scala:210)
5353
// at dotty.tools.backend.jvm.BCodeSkelBuilder$PlainSkelBuilder.getClassBTypeAndRegisterInnerClass(BCodeSkelBuilder.scala:62)
5454
// at dotty.tools.backend.jvm.BCodeHelpers$BCInnerClassGen.internalName(BCodeHelpers.scala:237)
55-
"scala/Array.tasty",
56-
"scala/Boolean.tasty",
57-
"scala/Byte.tasty",
58-
"scala/Char.tasty",
59-
"scala/Double.tasty",
60-
"scala/Float.tasty",
61-
"scala/Int.tasty",
62-
"scala/Long.tasty",
63-
"scala/Short.tasty",
64-
"scala/Unit.tasty",
65-
).map(_.replace("/", separator))
55+
s"scala${separator}Array.tasty",
56+
s"scala${separator}Boolean.tasty",
57+
s"scala${separator}Byte.tasty",
58+
s"scala${separator}Char.tasty",
59+
s"scala${separator}Double.tasty",
60+
s"scala${separator}Float.tasty",
61+
s"scala${separator}Int.tasty",
62+
s"scala${separator}Long.tasty",
63+
s"scala${separator}Short.tasty",
64+
s"scala${separator}Unit.tasty",
65+
)

0 commit comments

Comments
 (0)