diff options
author | Dmitry Petrashko <dmitry.petrashko@gmail.com> | 2015-04-09 16:57:55 +0200 |
---|---|---|
committer | Dmitry Petrashko <dmitry.petrashko@gmail.com> | 2015-04-09 16:57:55 +0200 |
commit | afa630a78b4f2cd9bd799b5a0199b99548f18aaa (patch) | |
tree | 9da8ad19573c8c913b47a232a3b57662aa660ec1 /src/dotty/tools/dotc/core/pickling/PositionPickler.scala | |
parent | 33f5d62bcbc6ec649e739958fc19c4524305471c (diff) | |
download | dotty-afa630a78b4f2cd9bd799b5a0199b99548f18aaa.tar.gz dotty-afa630a78b4f2cd9bd799b5a0199b99548f18aaa.tar.bz2 dotty-afa630a78b4f2cd9bd799b5a0199b99548f18aaa.zip |
Remove trailing spaces in Dotty source.
Diffstat (limited to 'src/dotty/tools/dotc/core/pickling/PositionPickler.scala')
-rw-r--r-- | src/dotty/tools/dotc/core/pickling/PositionPickler.scala | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/dotty/tools/dotc/core/pickling/PositionPickler.scala b/src/dotty/tools/dotc/core/pickling/PositionPickler.scala index d791e37d2..e8a0b3d01 100644 --- a/src/dotty/tools/dotc/core/pickling/PositionPickler.scala +++ b/src/dotty/tools/dotc/core/pickling/PositionPickler.scala @@ -13,13 +13,13 @@ import TastyBuffer._ import util.Positions._ object PositionPickler { - + trait DeferredPosition { var parentPos: Position = NoPosition } - def traverse(x: Any, parentPos: Position, op: (Tree, Position) => Unit)(implicit ctx: Context): Unit = - if (parentPos.exists) + def traverse(x: Any, parentPos: Position, op: (Tree, Position) => Unit)(implicit ctx: Context): Unit = + if (parentPos.exists) x match { case x: Tree @unchecked => op(x, parentPos) @@ -33,7 +33,7 @@ object PositionPickler { case xs: TraversableOnce[_] => xs.foreach(traverse(_, parentPos, op)) case _ => - } + } } import PositionPickler._ @@ -41,18 +41,18 @@ class PositionPickler(pickler: TastyPickler, addrOfTree: Tree => Option[Addr]) { val buf = new TastyBuffer(100000) pickler.newSection("Positions", buf) import buf._ - + def picklePositions(roots: List[Tree], totalRange: Position)(implicit ctx: Context) = { var lastIndex = 0 def record(tree: Tree, parentPos: Position): Unit = if (tree.pos.exists) { def msg = s"failure to pickle $tree at ${tree.pos}, parent = $parentPos" - val endPos = tree.pos.end min parentPos.end + val endPos = tree.pos.end min parentPos.end // end positions can be larger than their parents // e.g. in the case of synthetic empty ranges, which are placed at the next token after // the current construct. val endDelta = endPos - parentPos.end - val startPos = + val startPos = if (endDelta == 0) tree.pos.start max parentPos.start else tree.pos.start min endPos // Since end positions are corrected above, start positions have to follow suit. val startDelta = startPos - parentPos.start @@ -68,7 +68,7 @@ class PositionPickler(pickler: TastyPickler, addrOfTree: Tree => Option[Addr]) { assert(startDelta >= 0, msg) } } - + buf.writeNat(totalRange.end) traverse(roots, totalRange, record) } |