summaryrefslogtreecommitdiff
path: root/src/interactive/scala/tools/nsc/interactive/Global.scala
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@typesafe.com>2013-11-12 14:18:52 -0800
committerAdriaan Moors <adriaan.moors@typesafe.com>2013-11-12 15:29:53 -0800
commited37907d4fe426ba804fee9d6c7c4062ae4cce5f (patch)
tree678256c3452474df31603a4100b08ca936b695e7 /src/interactive/scala/tools/nsc/interactive/Global.scala
parentbeed16825e53077c40ff38b035bfaafb3a4e39d5 (diff)
downloadscala-ed37907d4fe426ba804fee9d6c7c4062ae4cce5f.tar.gz
scala-ed37907d4fe426ba804fee9d6c7c4062ae4cce5f.tar.bz2
scala-ed37907d4fe426ba804fee9d6c7c4062ae4cce5f.zip
Refactoring to prepare modularization of the compiler.
Actual modularization is delayed until 2.12. The one big (one-line) change is to make the interactive compiler independent of scaladoc. We have one "integration test": `MemoryLeaksTest`. This commit adds a bunch of comments marked `TODO: modularize the compiler`, that should be uncommented when we're ready to continue the modularization effort. I decided to merge them commented out to avoid having to rebase xml patches. There's still some chance of bitrot, but I'm willing to take my chances. I previously refactored the build to make it easier to add jars in a coherent way, which hinges on the `init-project-prop` mechanism, so the relevant properties are already injected there.
Diffstat (limited to 'src/interactive/scala/tools/nsc/interactive/Global.scala')
-rw-r--r--src/interactive/scala/tools/nsc/interactive/Global.scala8
1 files changed, 0 insertions, 8 deletions
diff --git a/src/interactive/scala/tools/nsc/interactive/Global.scala b/src/interactive/scala/tools/nsc/interactive/Global.scala
index 736a1e68c4..94f9aef38b 100644
--- a/src/interactive/scala/tools/nsc/interactive/Global.scala
+++ b/src/interactive/scala/tools/nsc/interactive/Global.scala
@@ -13,7 +13,6 @@ import scala.tools.nsc.io.AbstractFile
import scala.reflect.internal.util.{ SourceFile, BatchSourceFile, Position, NoPosition }
import scala.tools.nsc.reporters._
import scala.tools.nsc.symtab._
-import scala.tools.nsc.doc.ScaladocAnalyzer
import scala.tools.nsc.typechecker.Analyzer
import symtab.Flags.{ACCESSOR, PARAMACCESSOR}
import scala.annotation.{ elidable, tailrec }
@@ -32,13 +31,6 @@ trait CommentPreservingTypers extends Typers {
override def resetDocComments() = {}
}
-trait InteractiveScaladocAnalyzer extends InteractiveAnalyzer with ScaladocAnalyzer {
- val global : Global
- override def newTyper(context: Context) = new Typer(context) with InteractiveTyper with ScaladocTyper {
- override def canAdaptConstantTypeToLiteral = false
- }
-}
-
trait InteractiveAnalyzer extends Analyzer {
val global : Global
import global._