Refactoring typechecker

src/compiler/scala/reflect/macros/runtime/JavaReflectionRuntimes.scala

@@ -6,8 +6,9 @@ import scala.reflect.macros.blackbox.{Context => BlackboxContext}
 import scala.reflect.macros.whitebox.{Context => WhiteboxContext}
 import java.lang.reflect.{Constructor => jConstructor}
 
-trait JavaReflectionRuntimes {
-  self: scala.tools.nsc.typechecker.Analyzer =>
+trait JavaReflectionRuntime {
+  //self: scala.tools.nsc.typechecker.Analyzer =>
+  self: DefaultMacroRuntimes with util.Traces =>
 
   trait JavaReflectionResolvers {
     self: MacroRuntimeResolver =>

src/compiler/scala/reflect/macros/runtime/MacroRuntimes.scala

@@ -3,9 +3,14 @@ package runtime
 
 import scala.reflect.internal.Flags._
 import scala.reflect.runtime.ReflectionUtils
+import scala.tools.nsc.typechecker
 
-trait MacroRuntimes extends JavaReflectionRuntimes {
-  self: scala.tools.nsc.typechecker.Analyzer =>
+trait DefaultMacroRuntimes extends MacroRuntimes with JavaReflectionRuntime {
+  //self: scala.tools.nsc.typechecker.Analyzer =>
+  self: typechecker.Globals with 
+  util.Traces with 
+  typechecker.AnalyzerPlugins with 
+  typechecker.Macros =>
 
   import global._
   import definitions._
@@ -48,7 +53,6 @@ trait MacroRuntimes extends JavaReflectionRuntimes {
 
   /** Abstracts away resolution of macro runtimes.
    */
-  type MacroRuntime = MacroArgs => Any
   class MacroRuntimeResolver(val macroDef: Symbol) extends JavaReflectionResolvers {
     val binding = loadMacroImplBinding(macroDef).get
     val isBundle = binding.isBundle

src/compiler/scala/reflect/macros/runtime/MacroRuntimesApi.scala

@@ -0,0 +1,10 @@
+package scala.reflect.macros.runtime
+
+import scala.tools.nsc.typechecker
+
+trait MacroRuntimes {
+  self: typechecker.Macros =>
+
+  // used externally
+  type MacroRuntime = MacroArgs => Any
+}

src/compiler/scala/reflect/macros/util/Helpers.scala

@@ -1,11 +1,11 @@
 package scala.reflect.macros
 package util
 
-import scala.tools.nsc.typechecker.Analyzer
+import scala.tools.nsc.Global
 
 trait Helpers {
-  self: Analyzer =>
-
+  val global:Global
+  
   import global._
   import definitions._
 

src/compiler/scala/tools/ant/Scalac.scala

@@ -683,7 +683,7 @@ class Scalac extends ScalaMatchingTask with ScalacShared {
     val reporter = new ConsoleReporter(settings)
     val compiler = newGlobal(settings, reporter)  // compiles the actual code
 
-    try new compiler.Run compile (sourceFiles map (_.toString))
+    try compiler.newRun compile (sourceFiles map (_.toString))
     catch {
       case ex: Throwable =>
         ex.printStackTrace()

src/compiler/scala/tools/ant/sabbus/ForeignCompiler.scala

@@ -32,7 +32,7 @@ class ForeignCompiler {
   private lazy val nsc: Global = {
     try {
       val command = new CompilerCommand(args.toList, settings)
-      new Global(command.settings, reporter)
+      new DefaultGlobal(command.settings, reporter)
     }
     catch {
       case ex @ FatalError(msg) =>
@@ -42,7 +42,7 @@ class ForeignCompiler {
 
   def compile(files: Array[File]): Int = {
     val command = new CompilerCommand(files.toList map (_.toString), settings)
-    (new nsc.Run) compile command.files
+    nsc.newRun compile command.files
     reporter.ERROR.count << 16 | reporter.WARNING.count
   }
 

src/compiler/scala/tools/nsc/CompilationUnits.scala

@@ -8,9 +8,13 @@ package scala.tools.nsc
 import scala.reflect.internal.util.{ SourceFile, NoSourceFile, FreshNameCreator }
 import scala.collection.mutable
 import scala.collection.mutable.{ LinkedHashSet, ListBuffer }
+import scala.tools.nsc.symtab.SymbolTable
+import scala.tools.nsc.backend.icode.ICodes
 
-trait CompilationUnits { global: Global =>
+trait CompilationUnits { global:SymbolTable =>
 
+  val icodes:ICodes
+
   /** An object representing a missing compilation unit.
    */
   object NoCompilationUnit extends CompilationUnit(NoSourceFile) {
@@ -131,8 +135,8 @@ trait CompilationUnits { global: Global =>
 
     @deprecated("Call global.currentRun.reporting.deprecationWarning directly instead.", "2.11.2")
     final def deprecationWarning(pos: Position, msg: String): Unit = currentRun.reporting.deprecationWarning(pos, msg)
-    @deprecated("Call global.currentRun.reporting.uncheckedWarning directly instead.", "2.11.2")
-    final def uncheckedWarning(pos: Position, msg: String): Unit   = currentRun.reporting.uncheckedWarning(pos, msg)
+    //@deprecated("Call global.currentRun.reporting.uncheckedWarning directly instead.", "2.11.2")
+    //final def uncheckedWarning(pos: Position, msg: String): Unit   = currentRun.reporting.uncheckedWarning(pos, msg)
 
     @deprecated("This method will be removed. It does nothing.", "2.11.2")
     final def comment(pos: Position, msg: String): Unit = {}

src/compiler/scala/tools/nsc/CompileServer.scala

@@ -36,8 +36,8 @@ class StandardCompileServer(fixPort: Int = 0) extends SocketServer(fixPort) {
   import runtime.{ totalMemory, freeMemory, maxMemory }
 
   /** Create a new compiler instance */
-  def newGlobal(settings: Settings, reporter: Reporter) =
-    new Global(settings, reporter) {
+  def newGlobal(settings: Settings, reporter: Reporter):Global =
+    new DefaultGlobal(settings, reporter) {
       override def inform(pos: Position, msg: String) = out.println(msg)
     }
 
@@ -146,7 +146,7 @@ class StandardCompileServer(fixPort: Int = 0) extends SocketServer(fixPort) {
         compiler = newGlobal(newSettings, reporter)
       }
       val c = compiler
-      try new c.Run() compile command.files
+      try c.newRun() compile command.files
       catch {
         case ex @ FatalError(msg) =>
           reporter.error(null, "fatal error: " + msg)

src/compiler/scala/tools/nsc/Driver.scala

@@ -28,7 +28,7 @@ abstract class Driver {
       reporter.echo(command.usageMsg)
       reporter.echo(compiler.pluginOptionsHelp)
     } else {
-      val run = new compiler.Run()
+      val run = compiler.newRun()
       run compile command.files
       reporter.printSummary()
     }