8000 WIP lazy package objects by retronym · Pull Request #9664 · scala/scala · GitHub
[go: up one dir, main page]
Skip to content

WIP lazy package objects #9664

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

WIP lazy package objects #9664

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions src/compiler/scala/tools/nsc/Global.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,13 @@ class Global(var currentSettings: Settings, reporter0: Reporter)

import definitions.findNamedMember
def findMemberFromRoot(fullName: Name): Symbol = rootMirror.findMemberFromRoot(fullName)

override def deferredOpenPackageModule(container: Symbol, dest: Symbol): Unit = {
if (isPast(currentRun.packageobjectsPhase)) {
super.openPackageModule(container, dest)
} else {
analyzer.packageObjects.deferredOpen(dest) = container
}
}
// alternate constructors ------------------------------------------

override def settings = currentSettings
Expand Down Expand Up @@ -1338,7 +1344,7 @@ class Global(var currentSettings: Settings, reporter0: Reporter)
*/
val parserPhase = phaseNamed("parser")
val namerPhase = phaseNamed("namer")
// val packageobjectsPhase = phaseNamed("packageobjects")
val packageobjectsPhase = phaseNamed("packageobjects")
val typerPhase = phaseNamed("typer")
// val inlineclassesPhase = phaseNamed("inlineclasses")
// val superaccessorsPhase = phaseNamed("superaccessors")
Expand Down
8 changes: 8 additions & 0 deletions src/compiler/scala/tools/nsc/typechecker/Analyzer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ trait Analyzer extends AnyRef
object packageObjects extends {
val global: Analyzer.this.global.type = Analyzer.this.global
} with SubComponent {
val deferredOpen = perRunCaches.newMap[Symbol, Symbol]()
val phaseName = "packageobjects"
val runsAfter = List[String]()
val runsRightAfter= Some("namer")
Expand All @@ -64,6 +65,9 @@ trait Analyzer extends AnyRef
override def traverse(tree: Tree): Unit = tree match {
case ModuleDef(_, _, _) =>
if (tree.symbol.name == nme.PACKAGEkw) {
// we've actually got a source file
deferredOpen.remove(tree.symbol.owner)

openPackageModule(tree.symbol, tree.symbol.owner)
}
case ClassDef(_, _, _, _) => () // make it fast
Expand All @@ -73,6 +77,10 @@ trait Analyzer extends AnyRef

def apply(unit: CompilationUnit): Unit = {
openPackageObjectsTraverser(unit.body)
deferredOpen.foreach {
case (dest, container) =>
openPackageModule(container, dest)
}
}
}
}
Expand Down
5 changes: 4 additions & 1 deletion src/reflect/scala/reflect/internal/SymbolTable.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,6 +339,9 @@ abstract class SymbolTable extends macros.Universe
}
}

def deferredOpenPackageModule(container: Symbol, dest: Symbol): Unit = {
openPackageModule(container, dest)
}
def openPackageModule(container: Symbol, dest: Symbol): Unit = {
// unlink existing symbols in the package
for (member <- container.info.decls.iterator) {
Expand Down Expand Up @@ -396,7 +399,7 @@ abstract class SymbolTable extends macros.Universe
case _ => false
}
if (pkgModule.isModule && !fromSource) {
openPackageModule(pkgModule, pkgClass)
deferredOpenPackageModule(pkgModule, pkgClass)
}
}

Expand Down
0