diff options
| author | Eugene Burmako <xeno.by@gmail.com> | 2014-02-15 00:54:38 +0100 |
|---|---|---|
| committer | Eugene Burmako <xeno.by@gmail.com> | 2014-02-15 13:05:59 +0100 |
| commit | ac7ba71649217de837f1cad40d7e9b1fc2a07c11 (patch) | |
| tree | 2f42ae58979a4e53067d5ceda09e77c626bd6ec5 | |
| parent | cc47ec1102db0a0e09d4b321226f5fdaa8e6c455 (diff) | |
| download | scala-async-ac7ba71649217de837f1cad40d7e9b1fc2a07c11.tar.gz scala-async-ac7ba71649217de837f1cad40d7e9b1fc2a07c11.tar.bz2 scala-async-ac7ba71649217de837f1cad40d7e9b1fc2a07c11.zip | |
AsyncMacro.macroApplication is gone
| -rw-r--r-- | src/main/scala/scala/async/internal/AsyncMacro.scala | 6 | ||||
| -rw-r--r-- | src/main/scala/scala/async/internal/AsyncTransform.scala | 2 | ||||
| -rw-r--r-- | src/main/scala/scala/async/internal/TransformUtils.scala | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/src/main/scala/scala/async/internal/AsyncMacro.scala b/src/main/scala/scala/async/internal/AsyncMacro.scala index 4af69bc..30aa1dd 100644 --- a/src/main/scala/scala/async/internal/AsyncMacro.scala +++ b/src/main/scala/scala/async/internal/AsyncMacro.scala @@ -10,7 +10,6 @@ object AsyncMacro { new AsyncMacro { self => val c: scala.reflect.macros.Context { val universe: global.type } = c0.asInstanceOf[scala.reflect.macros.Context { val universe: global.type }] val global: powerContext.universe.type = powerContext.universe - val macroApplication: global.Tree = c0.macroApplication.asInstanceOf[global.Tree] // This member is required by `AsyncTransform`: val asyncBase: AsyncBase = base // These members are required by `ExprBuilder`: @@ -26,8 +25,7 @@ private[async] trait AsyncMacro val c: scala.reflect.macros.Context { val universe: global.type } val global: Global - val macroApplication: global.Tree - lazy val macroPos = macroApplication.pos.makeTransparent - def atMacroPos(t: global.Tree) = global.atPos(macroPos)(t) + lazy val macroPos = c.macroApplication.pos.makeTransparent + def atMacroPos(t: global.Tree) = c.universe.atPos(macroPos)(t) } diff --git a/src/main/scala/scala/async/internal/AsyncTransform.scala b/src/main/scala/scala/async/internal/AsyncTransform.scala index 8b6abe1..f66644f 100644 --- a/src/main/scala/scala/async/internal/AsyncTransform.scala +++ b/src/main/scala/scala/async/internal/AsyncTransform.scala @@ -123,7 +123,7 @@ trait AsyncTransform { } AsyncUtils.vprintln(s"In file '$location':") - AsyncUtils.vprintln(s"${macroApplication}") + AsyncUtils.vprintln(s"${c.macroApplication}") AsyncUtils.vprintln(s"ANF transform expands to:\n $anfTree") states foreach (s => AsyncUtils.vprintln(s)) } diff --git a/src/main/scala/scala/async/internal/TransformUtils.scala b/src/main/scala/scala/async/internal/TransformUtils.scala index 03046a0..c44b2c8 100644 --- a/src/main/scala/scala/async/internal/TransformUtils.scala +++ b/src/main/scala/scala/async/internal/TransformUtils.scala @@ -83,7 +83,7 @@ private[async] trait TransformUtils { } val NonFatalClass = rootMirror.staticModule("scala.util.control.NonFatal") - val Async_await = asyncBase.awaitMethod(c.universe)(macroApplication.symbol).ensuring(_ != NoSymbol) + val Async_await = asyncBase.awaitMethod(c.universe)(c.macroApplication.symbol).ensuring(_ != NoSymbol) } def isSafeToInline(tree: Tree) = { |