diff options
| author | Paul Phillips <paulp@improving.org> | 2013-04-29 16:56:50 -0700 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2013-04-29 16:56:50 -0700 |
| commit | 1f2772a2375a02937d71b33ac5a6a9cc6eb2fdb5 (patch) | |
| tree | d71fb3154b403a24fe225df13a06346681609317 /src | |
| parent | e44effe729d89ff6579409b80eecc53b53a6a8e9 (diff) | |
| parent | d4192272d1546dcf842b3df8f79ac29ccab2faea (diff) | |
| download | scala-1f2772a2375a02937d71b33ac5a6a9cc6eb2fdb5.tar.gz scala-1f2772a2375a02937d71b33ac5a6a9cc6eb2fdb5.tar.bz2 scala-1f2772a2375a02937d71b33ac5a6a9cc6eb2fdb5.zip | |
Merge pull request #2469 from paulp/pr/explaintypes
Route -explaintypes through reporter.
Diffstat (limited to 'src')
4 files changed, 6 insertions, 5 deletions
diff --git a/src/compiler/scala/tools/nsc/Global.scala b/src/compiler/scala/tools/nsc/Global.scala index d0b59b53cc..e294d5a6c9 100644 --- a/src/compiler/scala/tools/nsc/Global.scala +++ b/src/compiler/scala/tools/nsc/Global.scala @@ -218,7 +218,7 @@ class Global(var currentSettings: Settings, var reporter: Reporter) // not deprecated yet, but a method called "error" imported into // nearly every trait really must go. For now using globalError. def error(msg: String) = globalError(msg) - def inform(msg: String) = reporter.echo(msg) + override def inform(msg: String) = reporter.echo(msg) override def globalError(msg: String) = reporter.error(NoPosition, msg) override def warning(msg: String) = if (settings.fatalWarnings) globalError(msg) diff --git a/src/reflect/scala/reflect/internal/SymbolTable.scala b/src/reflect/scala/reflect/internal/SymbolTable.scala index 336c2748c6..1e70b31044 100644 --- a/src/reflect/scala/reflect/internal/SymbolTable.scala +++ b/src/reflect/scala/reflect/internal/SymbolTable.scala @@ -47,6 +47,7 @@ abstract class SymbolTable extends macros.Universe def log(msg: => AnyRef): Unit def warning(msg: String): Unit = Console.err.println(msg) + def inform(msg: String): Unit = Console.err.println(msg) def globalError(msg: String): Unit = abort(msg) def abort(msg: String): Nothing = throw new FatalError(supplementErrorMessage(msg)) diff --git a/src/reflect/scala/reflect/internal/Types.scala b/src/reflect/scala/reflect/internal/Types.scala index 75b4e9c100..7d43e815ec 100644 --- a/src/reflect/scala/reflect/internal/Types.scala +++ b/src/reflect/scala/reflect/internal/Types.scala @@ -4434,11 +4434,11 @@ trait Types /** Perform operation `p` on arguments `tp1`, `arg2` and print trace of computation. */ protected def explain[T](op: String, p: (Type, T) => Boolean, tp1: Type, arg2: T): Boolean = { - Console.println(indent + tp1 + " " + op + " " + arg2 + "?" /* + "("+tp1.getClass+","+arg2.getClass+")"*/) + inform(indent + tp1 + " " + op + " " + arg2 + "?" /* + "("+tp1.getClass+","+arg2.getClass+")"*/) indent = indent + " " val result = p(tp1, arg2) indent = indent stripSuffix " " - Console.println(indent + result) + inform(indent + result) result } diff --git a/src/reflect/scala/reflect/runtime/JavaUniverse.scala b/src/reflect/scala/reflect/runtime/JavaUniverse.scala index 4d90afcdc3..56f33ffddc 100644 --- a/src/reflect/scala/reflect/runtime/JavaUniverse.scala +++ b/src/reflect/scala/reflect/runtime/JavaUniverse.scala @@ -9,12 +9,12 @@ package runtime */ class JavaUniverse extends internal.SymbolTable with ReflectSetup with runtime.SymbolTable { self => - def inform(msg: String): Unit = log(msg) + override def inform(msg: String): Unit = log(msg) def picklerPhase = internal.SomePhase lazy val settings = new Settings private val isLogging = sys.props contains "scala.debug.reflect" - def log(msg: => AnyRef): Unit = if (isLogging) Console.err.println("[reflect] " + msg) + def log(msg: => AnyRef): Unit = if (isLogging) Console.err.println("[reflect] " + msg) type TreeCopier = InternalTreeCopierOps def newStrictTreeCopier: TreeCopier = new StrictTreeCopier |