summaryrefslogtreecommitdiff
path: root/src/compiler/scala/tools/nsc/Global.scala
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2011-05-31 05:08:07 +0000
committerPaul Phillips <paulp@improving.org>2011-05-31 05:08:07 +0000
commit35f7c2bde563b501e9661aace1e1610990b51544 (patch)
tree8edd9b4f4fdbae46112f0d848230db2e49f7d55c /src/compiler/scala/tools/nsc/Global.scala
parent82eaeed3b1bf3d4e9a6b4c4dedfeed0e603e56e7 (diff)
downloadscala-35f7c2bde563b501e9661aace1e1610990b51544.tar.gz
scala-35f7c2bde563b501e9661aace1e1610990b51544.tar.bz2
scala-35f7c2bde563b501e9661aace1e1610990b51544.zip
Moved some pure string manipulation functions o...
Moved some pure string manipulation functions out of the base class for all Reporters and into a more suitable home. "Please, help stamp out inheritance abuse. If you won't do it for yourself do it for your children... or your subclass's children." Also removed some dead reporter code (not used anywhere, including the IDE.) No review.
Diffstat (limited to 'src/compiler/scala/tools/nsc/Global.scala')
-rw-r--r--src/compiler/scala/tools/nsc/Global.scala6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/compiler/scala/tools/nsc/Global.scala b/src/compiler/scala/tools/nsc/Global.scala
index c98562f1f0..0f5be1791b 100644
--- a/src/compiler/scala/tools/nsc/Global.scala
+++ b/src/compiler/scala/tools/nsc/Global.scala
@@ -338,7 +338,7 @@ class Global(var currentSettings: Settings, var reporter: Reporter) extends Symb
currentRun.currentUnit = unit
if (!cancelled(unit)) {
currentRun.informUnitStarting(this, unit)
- reporter.withSource(unit.source) { apply(unit) }
+ apply(unit)
}
currentRun.advanceUnit
} finally {
@@ -1066,9 +1066,7 @@ class Global(var currentSettings: Settings, var reporter: Reporter) extends Symb
def loop(ph: Phase) {
if (stop(ph)) refreshProgress
else {
- reporter.withSource(unit.source) {
- atPhase(ph)(ph.asInstanceOf[GlobalPhase] applyPhase unit)
- }
+ atPhase(ph)(ph.asInstanceOf[GlobalPhase] applyPhase unit)
loop(ph.next match {
case `ph` => null // ph == ph.next implies terminal, and null ends processing
case x => x