summaryrefslogtreecommitdiff
path: root/src/compiler/scala/tools/nsc/reporters/AbstractReporter.scala
diff options
context:
space:
mode:
authormichelou <michelou@epfl.ch>2007-02-09 15:25:31 +0000
committermichelou <michelou@epfl.ch>2007-02-09 15:25:31 +0000
commitcc20f5fbb5321eec19109355eb843545f3b0d453 (patch)
treec453865cd6c9836a7f47e51ce1e7e72572938bc8 /src/compiler/scala/tools/nsc/reporters/AbstractReporter.scala
parent04cbd87417cc0a0ffae59e434cb8e129d8fbb0eb (diff)
downloadscala-cc20f5fbb5321eec19109355eb843545f3b0d453.tar.gz
scala-cc20f5fbb5321eec19109355eb843545f3b0d453.tar.bz2
scala-cc20f5fbb5321eec19109355eb843545f3b0d453.zip
minor changes in reporters/*.scala
Diffstat (limited to 'src/compiler/scala/tools/nsc/reporters/AbstractReporter.scala')
-rw-r--r--src/compiler/scala/tools/nsc/reporters/AbstractReporter.scala45
1 files changed, 21 insertions, 24 deletions
diff --git a/src/compiler/scala/tools/nsc/reporters/AbstractReporter.scala b/src/compiler/scala/tools/nsc/reporters/AbstractReporter.scala
index 734b1527ed..c1c6aee3a3 100644
--- a/src/compiler/scala/tools/nsc/reporters/AbstractReporter.scala
+++ b/src/compiler/scala/tools/nsc/reporters/AbstractReporter.scala
@@ -1,9 +1,7 @@
-/* ____ ____ ____ ____ ______ *\
-** / __// __ \/ __// __ \/ ____/ SOcos COmpiles Scala **
-** __\_ \/ /_/ / /__/ /_/ /\_ \ (c) 2002, LAMP/EPFL **
-** /_____/\____/\___/\____/____/ **
-\* */
-
+/* NSC -- new Scala compiler
+ * Copyright 2002-2007 LAMP/EPFL
+ * @author Martin Odersky
+ */
// $Id$
package scala.tools.nsc.reporters
@@ -16,41 +14,40 @@ import nsc.Settings
* This reporter implements filtering.
*/
abstract class AbstractReporter extends Reporter {
- private val positions = new HashSet[Position]();
+ private val positions = new HashSet[Position]()
val settings: Settings
- def display(pos : Position, msg : String, severity : Severity) : Unit
- def displayPrompt : Unit
+ def display(pos: Position, msg: String, severity: Severity): Unit
+ def displayPrompt: Unit
- protected def info0(pos : Position, msg : String, severity : Severity, force : Boolean) : Unit =
+ protected def info0(pos: Position, msg: String, severity: Severity, force: Boolean): Unit =
severity match {
- case INFO => if (force || settings.verbose.value) display(pos, msg, severity)
- case WARNING => {
+ case INFO =>
+ if (force || settings.verbose.value) display(pos, msg, severity)
+ case WARNING =>
val hidden = testAndLog(pos)
if (!settings.nowarnings.value) {
if (!hidden || settings.prompt.value) display(pos, msg, severity)
if (settings.prompt.value) displayPrompt
}
- }
- case ERROR => {
- val hidden = testAndLog(pos);
+ case ERROR =>
+ val hidden = testAndLog(pos)
if (!hidden || settings.prompt.value) display(pos, msg, severity)
if (settings.prompt.value) displayPrompt
- }
}
- //########################################################################
- // Private Methods
-
- /** Logs a position and returns true if it was already logged. */
- private def testAndLog(pos : Position) : Boolean = {
+ /** Logs a position and returns <code>true</code> if it was already logged.
+ *
+ * @param pos ...
+ * @return <code>true</code> if <code>pos</code> was already logged.
+ */
+ private def testAndLog(pos: Position): Boolean = {
if (pos eq null) return false
if (pos.column == 0) return false
- if (positions.contains(pos)) return true
- positions += (pos)
+ if (positions contains pos) return true
+ positions += pos
return false
}
- //########################################################################
}