Polishings

Author: odersky

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

@@ -40,12 +40,12 @@ abstract class Positioned(implicit @transientParam src: SourceInfo) extends Prod
     //assert(id != 2067, getClass)
   }
 
-  /** Destructively update `mySpan` to given span. Also, set any missing
-   *  spans in children.
+  /** Destructively update `mySpan` to given span and potentially update `id` so that
+   *  it refers to `file`. Also, set any missing positions in children.
    */
   protected def setPos(span: Span, file: AbstractFile): Unit = {
-    setOneSpan(span, file)
-    if (span.exists) setChildSpans(span.toSynthetic, file)
+    setOnePos(span, file)
+    if (span.exists) setChildPositions(span.toSynthetic, file)
   }
 
   /** A positioned item like this one with given `span`.
@@ -82,7 +82,7 @@ abstract class Positioned(implicit @transientParam src: SourceInfo) extends Prod
   /** Set span of this tree only, without updating children spans.
    *  Called from Unpickler when entering positions.
    */
-  private[dotc] def setOneSpan(span: Span, file: AbstractFile = this.srcfile): Unit = {
+  private[dotc] def setOnePos(span: Span, file: AbstractFile = this.srcfile): Unit = {
     if (file != this.srcfile) setId(TreeIds.nextIdFor(file))
     mySpan = span
   }
@@ -98,7 +98,7 @@ abstract class Positioned(implicit @transientParam src: SourceInfo) extends Prod
    *  But since mutual tail recursion is not supported in Scala, we express it instead
    *  as a while loop with a termination by return in the middle.
    */
-  private def setChildSpans(span: Span, file: AbstractFile): Unit = {
+  private def setChildPositions(span: Span, file: AbstractFile): Unit = {
     var n = productArity                    // subnodes are analyzed right to left
     var elems: List[Any] = Nil              // children in lists still to be considered, from right to left
     var end = span.end                      // the last defined offset, fill in spans up to this offset

compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala

@@ -1335,7 +1335,7 @@ class TreeUnpickler(reader: TastyReader,
     /** Set position of `tree` at given `addr`. */
     def setPos[T <: untpd.Tree](addr: Addr, tree: T)(implicit ctx: Context): tree.type = {
       val pos = posAt(addr)
-      if (pos.exists) tree.setOneSpan(pos, ctx.source.file)
+      if (pos.exists) tree.setOnePos(pos, ctx.source.file)
       tree
     }
   }

compiler/src/dotty/tools/dotc/parsing/Parsers.scala

@@ -81,7 +81,7 @@ object Parsers {
      *  to position spanning from `start` to last read offset, with given point.
      *  If the last offset is less than or equal to start, the tree `t` did not
      *  consume any source for its construction. In this case, don't position it yet,
-     *  but wait for its position to be determined by `setChildSpans` when the
+     *  but wait for its position to be determined by `setChildPositions` when the
      *  parent node is positioned.
      */
     def atPos[T <: Positioned](start: Offset, point: Offset)(t: T): T =