reporting callback merged into compiler callback

Author: niktrop

src/dotty/tools/dotc/Driver.scala

@@ -2,7 +2,7 @@ package dotty.tools.dotc
 
 import config.CompilerCommand
 import core.Contexts.{Context, ContextBase}
-import dotty.tools.dotc.callbacks.{ReportingCallback, CompilerCallback}
+import callbacks.CompilerCallback
 import util.DotClass
 import reporting._
 import scala.util.control.NonFatal
@@ -37,7 +37,7 @@ abstract class Driver extends DotClass {
     val summary = CompilerCommand.distill(args)(rootCtx)
     // FIXME: We should reuse rootCtx instead of creating newCtx, but this
     // makes some tests fail with "denotation module _root_ invalid in run 2."
-    val newCtx = initCtx.setCompilerCallback(rootCtx.compilerCallback).setReportingCallback(rootCtx.reportingCallback)
+    val newCtx = initCtx.setCompilerCallback(rootCtx.compilerCallback)
     implicit val ctx: Context = newCtx.fresh.setSettings(summary.sstate)
     val fileNames = CompilerCommand.checkUsage(summary, sourcesRequired)
     (fileNames, ctx)
@@ -48,8 +48,8 @@ abstract class Driver extends DotClass {
     doCompile(newCompiler(), fileNames)(ctx)
   }
 
-  def process(args: Array[String], callback: CompilerCallback, reportingCallback: ReportingCallback): Reporter = {
-    process(args, initCtx.setCompilerCallback(callback).setReportingCallback(reportingCallback))
+  def process(args: Array[String], callback: CompilerCallback): Reporter = {
+    process(args, initCtx.setCompilerCallback(callback))
   }
 
   // We overload `process` instead of using a default argument so that we

src/dotty/tools/dotc/callbacks/CompilerCallback.java

@@ -51,4 +51,16 @@ public interface CompilerCallback {
     /** Called to show progress of the compilation process
      */
     void advance(int currentProgress, int totalProgress);
+
+    //Methods to pass compiler and debug messages and exceptions
+
+    void info(String msg, Position pos);
+
+    void warning(String msg, Position pos);
+
+    void error(String msg, Position pos);
+
+    void debug(String msg);
+
+    void trace(Throwable exception);
 }

src/dotty/tools/dotc/callbacks/ReportingCallback.java

@@ -13,7 +13,7 @@ import NameOps._
 import Uniques._
 import SymDenotations._
 import Flags.ParamAccessor
-import dotty.tools.dotc.callbacks.{CompilerCallback, ReportingCallback}
+import callbacks.CompilerCallback
 import util.Positions._
 import ast.Trees._
 import ast.untpd
@@ -78,11 +78,6 @@ object Contexts {
       base.compilerCallback = callback; this
     }
 
-    /** Set the reporting callback, shared by all contexts with the same `base` */
-    def setReportingCallback(callback: ReportingCallback): this.type = {
-      base.reportingCallback = callback; this
-    }
-
     /** The outer context */
     private[this] var _outer: Context = _
     protected def outer_=(outer: Context) = _outer = outer
@@ -546,8 +541,6 @@ object Contexts {
     /** The compiler callback implementation, or null if unset */
     var compilerCallback: CompilerCallback = _
 
-    var reportingCallback: ReportingCallback = _
-
     // Symbols state
 
     /** A counter for unique ids */

src/dotty/tools/dotc/core/Contexts.scala

@@ -268,14 +268,14 @@ abstract class Reporter {
   }
 
   private def doCallbackReport(d: Diagnostic)(implicit ctx: Context): Unit = {
-    val reportingCallback = ctx.reportingCallback
-    if (reportingCallback != null) {
+    val callback = ctx.compilerCallback
+    if (callback != null) {
       val position = if (d.pos.exists) new CallbackPositionAdapter(d.pos) else null
       d match {
-        case d: ConditionalWarning if d.enablingOption.value => reportingCallback.warning(d.msg, position)
-        case d: Warning => reportingCallback.warning(d.msg, position)
-        case d: Error => reportingCallback.error(d.msg, position)
-        case d: Info => reportingCallback.info(d.msg, position)
+        case d: ConditionalWarning if d.enablingOption.value => callback.warning(d.msg, position)
+        case d: Warning => callback.warning(d.msg, position)
+        case d: Error => callback.error(d.msg, position)
+        case d: Info => callback.info(d.msg, position)
       }
     }
   }