diff options
author | Martin Odersky <odersky@gmail.com> | 2016-09-15 21:45:26 +0200 |
---|---|---|
committer | Martin Odersky <odersky@gmail.com> | 2016-10-02 16:12:28 +0200 |
commit | 53b165e69bb45f424184d02e76c520b67ee0c1d7 (patch) | |
tree | 2b4f6123890b520e69dc14fe297e4a89dd79eb81 /src/dotty/tools/dotc/core/Decorators.scala | |
parent | bef012d32127e3d256d0ce31e1a2a27f7277f8d8 (diff) | |
download | dotty-53b165e69bb45f424184d02e76c520b67ee0c1d7.tar.gz dotty-53b165e69bb45f424184d02e76c520b67ee0c1d7.tar.bz2 dotty-53b165e69bb45f424184d02e76c520b67ee0c1d7.zip |
Cleanups
Better comments and refactorings that move some things around
so that less modules depend on Inliner.
Diffstat (limited to 'src/dotty/tools/dotc/core/Decorators.scala')
-rw-r--r-- | src/dotty/tools/dotc/core/Decorators.scala | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/dotty/tools/dotc/core/Decorators.scala b/src/dotty/tools/dotc/core/Decorators.scala index 691e0aeba..3bf17730a 100644 --- a/src/dotty/tools/dotc/core/Decorators.scala +++ b/src/dotty/tools/dotc/core/Decorators.scala @@ -7,8 +7,7 @@ import Contexts._, Names._, Phases._, printing.Texts._, printing.Printer, printi import util.Positions.Position, util.SourcePosition import collection.mutable.ListBuffer import dotty.tools.dotc.transform.TreeTransforms._ -import typer.Inliner -import ast.tpd.Tree +import ast.tpd._ import scala.language.implicitConversions import printing.Formatting._ @@ -153,11 +152,11 @@ object Decorators { implicit def sourcePos(pos: Position)(implicit ctx: Context): SourcePosition = { def recur(inlinedCalls: List[Tree], pos: Position): SourcePosition = inlinedCalls match { case inlinedCall :: rest => - Inliner.sourceFile(inlinedCall).atPos(pos).withOuter(recur(rest, inlinedCall.pos)) + sourceFile(inlinedCall).atPos(pos).withOuter(recur(rest, inlinedCall.pos)) case empty => ctx.source.atPos(pos) } - recur(Inliner.enclosingInlineds, pos) + recur(enclosingInlineds, pos) } implicit class StringInterpolators(val sc: StringContext) extends AnyVal { |