File tree Expand file tree Collapse file tree 2 files changed +10
-3
lines changed
src/dotty/tools/dotc/core Expand file tree Collapse file tree 2 files changed +10
-3
lines changed Original file line number Diff line number Diff line change @@ -1199,9 +1199,16 @@ object Denotations {
1199
1199
val alt =
1200
1200
if (generateStubs) missingHook(owner.symbol.moduleClass, selector)
1201
1201
else NoSymbol
1202
+
1203
+ def isPackageFromCoreLibMissing : Boolean = {
1204
+ owner.symbol == defn.RootClass &&
1205
+ {
1206
+ selector == nme.scala_ || // if the scala package is missing, the stdlib must be missing
1207
+ selector == nme.scalaShadowing // if the scalaShadowing package is missing, the dotty library must be missing
1208
+ }
1209
+ }
1202
1210
if (alt.exists) alt.denot
1203
- else if (owner.symbol == defn.RootClass && (selector == nme.scala_ || selector == nme.scalaShadowing))
1204
- throw new MissingCoreLibraryException (selector.toString)
1211
+ else if (isPackageFromCoreLibMissing) throw new MissingCoreLibraryException (selector.toString)
1205
1212
else MissingRef (owner, selector)
1206
1213
}
1207
1214
}
Original file line number Diff line number Diff line change @@ -25,7 +25,7 @@ object TestConfiguration {
25
25
26
26
val classPath = mkClassPath(Jars .dottyTestDeps)
27
27
28
- def mkClassPath (deps : List [String ]) = {
28
+ def mkClassPath (deps : List [String ]): Array [ String ] = {
29
29
val paths = deps map { p =>
30
30
val file = new java.io.File (p)
31
31
assert(
You can’t perform that action at this time.
0 commit comments