reintroduced overwritten changes in Global.scala

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)
 }