aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2013-11-22 13:18:17 -0800
committerJason Zaugg <jzaugg@gmail.com>2013-11-22 13:18:17 -0800
commitf50b0d324060898d9ef19a4dbaf8f7cf4d3344cf (patch)
treeeb02fa9d3630897d88d1629cbf2887335e5a5447 /src
parentadbe51ef1050ec78eafcce7e45f848c4de8adf83 (diff)
parent7748c5e6eab31328da786b57a875d887d69ec50a (diff)
downloadscala-async-f50b0d324060898d9ef19a4dbaf8f7cf4d3344cf.tar.gz
scala-async-f50b0d324060898d9ef19a4dbaf8f7cf4d3344cf.tar.bz2
scala-async-f50b0d324060898d9ef19a4dbaf8f7cf4d3344cf.zip
Merge pull request #47 from retronym/topic/pres2
Another take at the 2.10/2.11 spanning suppressMacroAttachment
Diffstat (limited to 'src')
-rw-r--r--src/main/scala/scala/async/internal/AsyncMacro.scala11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/main/scala/scala/async/internal/AsyncMacro.scala b/src/main/scala/scala/async/internal/AsyncMacro.scala
index d030367..79f544c 100644
--- a/src/main/scala/scala/async/internal/AsyncMacro.scala
+++ b/src/main/scala/scala/async/internal/AsyncMacro.scala
@@ -37,15 +37,14 @@ private[async] trait AsyncMacro
// Eat it too : (domain specific errors like "unsupported use of await"
//
// TODO roll this idea back into scala/scala
- def suppress(globalOrAnalzer: Any) = {
- type Suppress = { def suppressMacroExpansion(a: Object): Object }
- globalOrAnalzer.asInstanceOf[Suppress].suppressMacroExpansion(macroApplication)
- }
+
+ import global.Tree
+ type Suppress = { def suppressMacroExpansion(a: Tree): Tree }
try {
- suppress(global) // 2.10.x
+ global.asInstanceOf[Suppress].suppressMacroExpansion(macroApplication)
} catch {
case _: NoSuchMethodException =>
- suppress(global.analyzer) // 2.11
+ global.analyzer.asInstanceOf[Suppress].suppressMacroExpansion(macroApplication)
}
}