withPos(Positioned) -> withPosOf

Author: odersky

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

@@ -52,12 +52,13 @@ abstract class Positioned(implicit @transientParam src: SourceInfo) extends Prod
    */
   def withPos(pos: Position)(implicit src: SourceInfo): this.type = {
     val ownPos = this.pos
-    val newpd: this.type = if (pos == ownPos || ownPos.isSynthetic) this else cloneIn(srcfile)
+    val newpd: this.type =
+      if (pos == ownPos || ownPos.isSynthetic) this else cloneIn(srcfile)
     newpd.setPos(pos, srcfile)
     newpd
   }
 
-  def withPos(posd: Positioned)(implicit ctx: Context): this.type = {
+  def withPosOf(posd: Positioned)(implicit ctx: Context): this.type = {
     val ownPos = this.pos
     val newpd: this.type =
       if (posd.source == source && posd.pos == ownPos || ownPos.isSynthetic) this

compiler/src/dotty/tools/dotc/transform/ByNameClosures.scala

@@ -28,7 +28,7 @@ class ByNameClosures extends TransformByNameApply with IdentityDenotTransformer
   override def mkByNameClosure(arg: Tree, argType: Type)(implicit ctx: Context): Tree = {
     val meth = ctx.newSymbol(
       ctx.owner, nme.ANON_FUN, Synthetic | Method, MethodType(Nil, Nil, argType))
-    Closure(meth, _ => arg.changeOwnerAfter(ctx.owner, meth, thisPhase)).withPos(arg)
+    Closure(meth, _ => arg.changeOwnerAfter(ctx.owner, meth, thisPhase)).withPosOf(arg)
   }
 }
 

compiler/src/dotty/tools/dotc/transform/TransformByNameApply.scala

@@ -44,7 +44,7 @@ abstract class TransformByNameApply extends MiniPhase { thisPhase: DenotTransfor
         var argType = arg.tpe.widenIfUnstable
         if (defn.isBottomType(argType)) argType = formal.widenExpr
         def wrap(arg: Tree) =
-          ref(defn.cbnArg).appliedToType(argType).appliedTo(arg).withPos(arg)
+          ref(defn.cbnArg).appliedToType(argType).appliedTo(arg).withPosOf(arg)
         arg match {
           case Apply(Select(qual, nme.apply), Nil)
           if qual.tpe.derivesFrom(defn.FunctionClass(0)) && isPureExpr(qual) =>

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

@@ -69,7 +69,7 @@ object Inliner {
       override def transform(t: Tree)(implicit ctx: Context) = {
         t match {
           case Inlined(t, Nil, expr) if t.isEmpty => expr
-          case _ => super.transform(t.withSourcePos(call.sourcePos))
+          case _ => super.transform(t.withPosOf(call))
         }
       }
     }
@@ -137,7 +137,7 @@ object Inliner {
                 case call :: _ if call.symbol.sourceFile != curSourceFile =>
                   // Until we implement JSR-45, we cannot represent in output positions in other source files.
                   // So, reposition inlined code from other files with the call position:
-                  transformed.withSourcePos(inlinedAtPos)
+                  transformed.withPosOf(inlined.call)
                 case _ => transformed
               }
           }
@@ -419,7 +419,7 @@ class Inliner(call: tpd.Tree, rhsToInline: tpd.Tree)(implicit ctx: Context) {
             case Some(t) if tree.isTerm && t.isSingleton =>
               singleton(t.dealias)
             case Some(t) if tree.isType =>
-              TypeTree(t).withSourcePos(tree.sourcePos)
+              TypeTree(t).withPosOf(tree)
             case _ => tree
           }
         case tree => tree
@@ -430,7 +430,7 @@ class Inliner(call: tpd.Tree, rhsToInline: tpd.Tree)(implicit ctx: Context) {
 
     // Apply inliner to `rhsToInline`, split off any implicit bindings from result, and
     // make them part of `bindingsBuf`. The expansion is then the tree that remains.
-    val expansion = inliner.transform(rhsToInline).withSourcePos(call.sourcePos)
+    val expansion = inliner.transform(rhsToInline).withPosOf(call)
 
     def issueError() = callValueArgss match {
       case (msgArg :: rest) :: Nil =>
@@ -596,7 +596,7 @@ class Inliner(call: tpd.Tree, rhsToInline: tpd.Tree)(implicit ctx: Context) {
         case _ =>
           binding
       }
-      binding1.withSourcePos(call.sourcePos)
+      binding1.withPosOf(call)
     }
 
     /** An extractor for references to inlineable arguments. These are :
@@ -1008,7 +1008,7 @@ class Inliner(call: tpd.Tree, rhsToInline: tpd.Tree)(implicit ctx: Context) {
         val t1 = t match {
           case t: RefTree =>
             if (t.name != nme.WILDCARD && boundTypes.contains(t.symbol))
-              TypeTree(dealiasedType).withSourcePos(t.sourcePos)
+              TypeTree(dealiasedType).withPosOf(t)
             else t.withType(dealiasedType)
           case t: DefTree =>
             t.symbol.info = dealias(t.symbol.info)