forked from scala/scala
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request scala#4650 from lrytz/t8502-package
SI-8502 create PackageClass instead of Class symbol stubs for pkgs
- Loading branch information
Showing
6 changed files
with
53 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,46 @@ | ||
import scala.tools.partest._ | ||
import java.io.File | ||
|
||
// used to crash with an assertion failure in flatten because the type symbol created for the missing | ||
// package was a ClassSymbol, not a PackageClassSymbol | ||
// - isFlattenablePrefix(vanishingPackage) was true (wrongly) | ||
// - therefore flatten tried to flatten the class defined in the package, but the class is | ||
// top-level, vanishingClass.enclosingTopLevelClass is NoSymbol | ||
object Test extends StoreReporterDirectTest { | ||
def code = ??? | ||
|
||
def compileCode(code: String) = { | ||
val classpath = List(sys.props("partest.lib"), testOutput.path) mkString sys.props("path.separator") | ||
compileString(newCompiler("-cp", classpath, "-d", testOutput.path))(code) | ||
} | ||
|
||
def show(): Unit = { | ||
compileCode(""" | ||
class Outer { | ||
class Nested extends vanishing.Vanishing | ||
} | ||
package vanishing { | ||
class Vanishing | ||
} | ||
""") | ||
assert(filteredInfos.isEmpty, filteredInfos) | ||
deletePackage("vanishing") | ||
compileCode(""" | ||
class Test { | ||
def f(o: Outer): Outer = o | ||
} | ||
""") | ||
assert(storeReporter.infos.isEmpty, storeReporter.infos.mkString("\n")) // Included a MissingRequirementError before. | ||
} | ||
|
||
def deletePackage(name: String) { | ||
val directory = new File(testOutput.path, name) | ||
for (f <- directory.listFiles()) { | ||
assert(f.getName.endsWith(".class")) | ||
assert(f.delete()) | ||
} | ||
assert(directory.listFiles().isEmpty) | ||
assert(directory.delete()) | ||
} | ||
} |