Updating Position call sites.

Calling position factories rather than instantiating these
particular classes. Not calling deprecated methods. Added a few
position combinator methods.

1 files changed, 4 insertions, 4 deletions

diff --git a/src/reflect/scala/reflect/internal/Positions.scala b/src/reflect/scala/reflect/internal/Positions.scala
index eef8159ad4..01fba1efc1 100644
--- a/src/reflect/scala/reflect/internal/Positions.scala
+++ b/src/reflect/scala/reflect/internal/Positions.scala
@@ -42,7 +42,7 @@ trait Positions extends api.Positions { self: SymbolTable =>
     if (useOffsetPositions) default else {
       val ranged = trees filter (_.pos.isRange)
       if (ranged.isEmpty) if (focus) default.focus else default
-      else new RangePosition(default.source, (ranged map (_.pos.start)).min, default.point, (ranged map (_.pos.end)).max)
+      else Position.range(default.source, (ranged map (_.pos.start)).min, default.point, (ranged map (_.pos.end)).max)
     }
   }
 
@@ -80,8 +80,8 @@ trait Positions extends api.Positions { self: SymbolTable =>
   }
 
   def rangePos(source: SourceFile, start: Int, point: Int, end: Int): Position =
-    if (useOffsetPositions) new OffsetPosition(source, point)
-    else new RangePosition(source, start, point, end)
+    if (useOffsetPositions) Position.offset(source, point)
+    else Position.range(source, start, point, end)
 
   def validatePositions(tree: Tree) {
     if (useOffsetPositions) return
@@ -156,7 +156,7 @@ trait Positions extends api.Positions { self: SymbolTable =>
 
   /** A free range from `lo` to `hi` */
   private def free(lo: Int, hi: Int): Range =
-    Range(new RangePosition(null, lo, lo, hi), EmptyTree)
+    Range(Position.range(null, lo, lo, hi), EmptyTree)
 
   /** The maximal free range */
   private lazy val maxFree: Range = free(0, Int.MaxValue)