Uniformly route reporting through reporter.

Sharpen interfaces, reduce footprint of Reporting trait.
Ideally, all reporting should indirect through reporter,
and the `Reporting` trait itself should be restricted to
a single method that retrieves the current `reporter`.

Pull up some more reporting to reflect.internal.
Would like to do more, but need to move partest to the
reflect.internal interface first.
(Its `errorCount` relies on `ERROR.count` in `tools.nsc.Reporter`.)

1 files changed, 7 insertions, 5 deletions

diff --git a/src/compiler/scala/tools/nsc/Reporting.scala b/src/compiler/scala/tools/nsc/Reporting.scala
index 614eb4f212..a8fd3bec76 100644
--- a/src/compiler/scala/tools/nsc/Reporting.scala
+++ b/src/compiler/scala/tools/nsc/Reporting.scala
@@ -10,9 +10,15 @@ package nsc
 import reporters.{ Reporter, ConsoleReporter }
 import scala.collection.{ mutable, immutable }
 
+/** Provides delegates to the reporter doing the actual work.
+ * PerRunReporting implements per-Run stateful info tracking and reporting
+ *
+ * TODO: make reporting configurable
+ */
 trait Reporting extends scala.reflect.internal.Reporting { self: ast.Positions with CompilationUnits with scala.reflect.api.Symbols =>
   def settings: Settings
-  def reporter: Reporter
+
+  // == currentRun.reporting
   def currentReporting: PerRunReporting
 
   def supplementTyperState(errorMessage: String): String
@@ -21,10 +27,6 @@ trait Reporting extends scala.reflect.internal.Reporting { self: ast.Positions w
   // nearly every trait really must go.  For now using globalError.
   def error(msg: String) = globalError(msg)
 
-  override def inform(pos: Position, msg: String)      = reporter.echo(pos, msg)
-  override def warning(pos: Position, msg: String)     = reporter.warning(pos, msg)
-  override def globalError(pos: Position, msg: String) = reporter.error(pos, msg)
-
   override def deprecationWarning(pos: Position, msg: String) = currentReporting.deprecationWarning(pos, msg)
   override def supplementErrorMessage(errorMessage: String)   = currentReporting.supplementErrorMessage(errorMessage)