From 208b46fd1062a299c65b0ef10e63edbd85507b02 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Sun, 13 May 2012 21:31:40 -0400
Subject: [PATCH] resident mode: package objects

---
 compile/interface/Analyzer.scala          |  4 +++
 compile/interface/CompilerInterface.scala | 41 +++++++++++++++++++++--
 2 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/compile/interface/Analyzer.scala b/compile/interface/Analyzer.scala
index 719a5a5a1..e20dd46cc 100644
--- a/compile/interface/Analyzer.scala
+++ b/compile/interface/Analyzer.scala
@@ -121,6 +121,7 @@ abstract class Compat
 	import global._
 	val LocalChild = global.tpnme.LOCAL_CHILD
 	val Nullary = global.NullaryMethodType
+	val ScalaObjectClass = definitions.ScalaObjectClass	
 
 	private[this] final class MiscCompat
 	{
@@ -129,6 +130,9 @@ abstract class Compat
 		def LOCAL_CHILD = nme.LOCALCHILD
 		def LOCALCHILD = sourceCompatibilityOnly
 
+		// in 2.10, ScalaObject was removed
+		def ScalaObjectClass = definitions.ObjectClass
+
 		def NullaryMethodType = NullaryMethodTpe
 
 		def MACRO = DummyValue
diff --git a/compile/interface/CompilerInterface.scala b/compile/interface/CompilerInterface.scala
index c0110af5a..282c64631 100644
--- a/compile/interface/CompilerInterface.scala
+++ b/compile/interface/CompilerInterface.scala
@@ -173,6 +173,12 @@ private final class CachedCompiler0(args: Array[String], initialLog: WeakLog) ex
 			reporter = null
 		}
 
+		private[this] val ScalaObjectClass = {
+			// ScalaObject removed in 2.10, so alias it to Object
+			implicit def compat(a: AnyRef): CompatScalaObject = new CompatScalaObject
+			class CompatScalaObject { def ScalaObjectClass = definitions.ObjectClass }
+			definitions.ScalaObjectClass
+		}
 		override def registerTopLevelSym(sym: Symbol) = toForget += sym
 
 		def findClass(name: String): Option[(AbstractFile, Boolean)] =
@@ -184,7 +190,8 @@ private final class CachedCompiler0(args: Array[String], initialLog: WeakLog) ex
 			if(f.exists) Some(AbstractFile.getFile(f)) else None
 		}
 
-		def findOnClassPath(name: String): Option[AbstractFile] = classPath.findClass(name).flatMap(_.binary.asInstanceOf[Option[AbstractFile]])
+		def findOnClassPath(name: String): Option[AbstractFile] =
+			classPath.findClass(name).flatMap(_.binary.asInstanceOf[Option[AbstractFile]])
 
 		final def unlinkAll(m: Symbol) {
 			val scope = m.owner.info.decls
@@ -218,10 +225,40 @@ private final class CachedCompiler0(args: Array[String], initialLog: WeakLog) ex
 				classFile <- getOutputClass(fullName)
 			}
 				reloadClass(pkg, simpleName, classFile)
+	
+			for( (_, (pkg, "package")) <- toReload)
+				openPkgModule(pkg)
 
 			toReload = newReloadMap()
 		}
-		
+		def openPkgModule(pkgClass: Symbol): Unit =
+			openPkgModule(pkgClass.info.decl(nme.PACKAGEkw), pkgClass)
+
+		// only easily accessible in 2.10+, so copy implementation here
+		def openPkgModule(container: Symbol, dest: Symbol)
+		{
+			val destScope = dest.info.decls
+			def include(member: Symbol) = !member.isPrivate && !member.isConstructor
+			for(member <- container.info.decls.iterator) {
+				if(include(member))
+					for(existing <- dest.info.decl(member.name).alternatives)
+						destScope.unlink(existing)
+			}
+
+			for(member <- container.info.decls.iterator) {
+				if(include(member))
+					destScope.enter(member)
+			}
+
+			for(p <- parentSymbols(container)) {
+				if(p != definitions.ObjectClass && p != ScalaObjectClass)
+					openPkgModule(p, dest)
+			}
+		}
+
+		// only in 2.10+, so copy implementation here for earlier versions
+		def parentSymbols(sym: Symbol): List[Symbol] = sym.info.parents map (_.typeSymbol)
+
 		private [this] def newReloadMap() = mutable.Map[String,(Symbol,String)]()
 		private[this] var emptyPackages = mutable.Set[Symbol]()
 		private[this] var toReload = newReloadMap()