diff options
author | michelou <michelou@epfl.ch> | 2006-09-22 13:08:10 +0000 |
---|---|---|
committer | michelou <michelou@epfl.ch> | 2006-09-22 13:08:10 +0000 |
commit | 8ee34d403608e6e414e03e192c69d8256a1218d7 (patch) | |
tree | 6a6a021f324efe60a31f96dd1a5ccb8ccb6d1a76 /src/compiler/scala/tools/nsc | |
parent | c8964378fb5f7b0087120dcb2105315bd1d45201 (diff) | |
download | scala-8ee34d403608e6e414e03e192c69d8256a1218d7.tar.gz scala-8ee34d403608e6e414e03e192c69d8256a1218d7.tar.bz2 scala-8ee34d403608e6e414e03e192c69d8256a1218d7.zip |
reintroduced overwritten changes in Global.scala
Diffstat (limited to 'src/compiler/scala/tools/nsc')
-rw-r--r-- | src/compiler/scala/tools/nsc/Global.scala | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/compiler/scala/tools/nsc/Global.scala b/src/compiler/scala/tools/nsc/Global.scala index ce75abe609..01d1ed4eac 100644 --- a/src/compiler/scala/tools/nsc/Global.scala +++ b/src/compiler/scala/tools/nsc/Global.scala @@ -232,9 +232,7 @@ class Global(var settings: Settings, var reporter: Reporter) extends SymbolTable } object analyzer extends Analyzer { - val global: Global.this.type = { - Global.this - } + val global: Global.this.type = Global.this } object superAccessors extends SuperAccessors { @@ -617,16 +615,18 @@ class Global(var settings: Settings, var reporter: Reporter) extends SymbolTable def forCLDC: Boolean = settings.target.value == "cldc" def onlyPresentation = settings.doc.value // position stuff - protected val positionConfiguration : PositionConfiguration = new PositionConfiguration { - type PositionType = Int; - def coercePosToInt(pos : PositionType) : Int = pos; - def coerceIntToPos(pos : Int) : PositionType = pos; - val NoPos : PositionType = Position.NOPOS; - val FirstPos : PositionType = Position.FIRSTPOS; - } - final type PositionType = positionConfiguration.PositionType; - final def FirstPos = positionConfiguration.FirstPos; - final def NoPos = positionConfiguration.NoPos; - final def coerceIntToPos(pos : Int) : PositionType = positionConfiguration.coerceIntToPos(pos); - implicit final def coercePosToInt(pos : PositionType) : Int = positionConfiguration.coercePosToInt(pos); + protected val positionConfiguration: PositionConfiguration = new PositionConfiguration { + type PositionType = Int + def coercePosToInt(pos: PositionType): Int = pos + def coerceIntToPos(pos: Int): PositionType = pos + val NoPos: PositionType = Position.NOPOS + val FirstPos: PositionType = Position.FIRSTPOS + } + final type PositionType = positionConfiguration.PositionType + final val FirstPos = positionConfiguration.FirstPos + final val NoPos = positionConfiguration.NoPos + final def coerceIntToPos(pos: Int): PositionType = + positionConfiguration.coerceIntToPos(pos) + implicit final def coercePosToInt(pos: PositionType): Int = + positionConfiguration.coercePosToInt(pos) } |