Rename withSourcePos -> withPos

Author: odersky

compiler/src/dotty/tools/dotc/ast/Positioned.scala

@@ -68,12 +68,12 @@ abstract class Positioned(implicit @transientParam src: SourceFile) extends Prod
     newpd
   }
 
-  def withSourcePos(sourcePos: Position): this.type = {
+  def withPos(pos: Position): this.type = {
     val ownSpan = this.span
     val newpd: this.type =
-      if ((sourcePos.source `eq` source) && sourcePos.span == ownSpan || ownSpan.isSynthetic) this
-      else cloneIn(sourcePos.source)
-    newpd.setPos(sourcePos.span, sourcePos.source)
+      if ((pos.source `eq` source) && pos.span == ownSpan || ownSpan.isSynthetic) this
+      else cloneIn(pos.source)
+    newpd.setPos(pos.span, pos.source)
     newpd
   }
 

compiler/src/dotty/tools/dotc/ast/Trees.scala

@@ -809,8 +809,8 @@ object Trees {
       mapElems(_.withSpan(span)).asInstanceOf[this.type]
     override def withPosOf(posd: Positioned): this.type =
       mapElems(_.withPosOf(posd)).asInstanceOf[this.type]
-    override def withSourcePos(sourcePos: Position): this.type =
-      mapElems(_.withSourcePos(sourcePos)).asInstanceOf[this.type]
+    override def withPos(pos: Position): this.type =
+      mapElems(_.withPos(pos)).asInstanceOf[this.type]
   }
 
   class EmptyTree[T >: Untyped] extends Thicket(Nil)(NoSource) {

compiler/src/dotty/tools/dotc/typer/Inliner.scala

@@ -160,7 +160,7 @@ object Inliner {
    *  The trace has enough info to completely reconstruct positions.
    */
   def inlineCallTrace(callSym: Symbol, pos: Position)(implicit ctx: Context): Tree =
-    Ident(callSym.topLevelClass.typeRef).withSourcePos(pos)
+    Ident(callSym.topLevelClass.typeRef).withPos(pos)
 }
 
 /** Produces an inlined version of `call` via its `inlined` method.
@@ -235,7 +235,7 @@ class Inliner(call: tpd.Tree, rhsToInline: tpd.Tree)(implicit ctx: Context) {
     val binding = {
       if (isByName) DefDef(boundSym, arg.changeOwner(ctx.owner, boundSym))
       else ValDef(boundSym, arg)
-    }.withSourcePos(boundSym.pos)
+    }.withPos(boundSym.pos)
     boundSym.defTree = binding
     bindingsBuf += binding
     binding
@@ -289,7 +289,7 @@ class Inliner(call: tpd.Tree, rhsToInline: tpd.Tree)(implicit ctx: Context) {
           ref(rhsClsSym.sourceModule)
         else
           inlineCallPrefix
-      val binding = ValDef(selfSym.asTerm, rhs).withSourcePos(selfSym.pos)
+      val binding = ValDef(selfSym.asTerm, rhs).withPos(selfSym.pos)
       bindingsBuf += binding
       selfSym.defTree = binding
       inlining.println(i"proxy at $level: $selfSym = ${bindingsBuf.last}")

tests/plugins/neg/divideZero-research/plugin_1.scala

@@ -30,7 +30,7 @@ class DivideZero extends MiniPhase with ResearchPlugin {
 
   override def transformApply(tree: tpd.Apply)(implicit ctx: Context): tpd.Tree = tree match {
     case tpd.Apply(fun, tpd.Literal(Constants.Constant(v)) :: Nil) if isNumericDivide(fun.symbol) && v == 0 =>
-      ctx.error("divide by zero", tree.sourcePos)
+      ctx.error("divide by zero", tree.pos)
       tree
     case _ =>
       tree

tests/plugins/neg/divideZero/plugin_1.scala

@@ -31,7 +31,7 @@ class DivideZero extends PluginPhase with StandardPlugin {
 
   override def transformApply(tree: tpd.Apply)(implicit ctx: Context): tpd.Tree = tree match {
     case tpd.Apply(fun, tpd.Literal(Constants.Constant(v)) :: Nil) if isNumericDivide(fun.symbol) && v == 0 =>
-      ctx.error("divide by zero", tree.sourcePos)
+      ctx.error("divide by zero", tree.pos)
       tree
     case _ =>
       tree