aboutsummaryrefslogtreecommitdiff
path: root/src/main/scala/scala/async/internal/AsyncAnalysis.scala
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/scala/scala/async/internal/AsyncAnalysis.scala')
-rw-r--r--src/main/scala/scala/async/internal/AsyncAnalysis.scala10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/main/scala/scala/async/internal/AsyncAnalysis.scala b/src/main/scala/scala/async/internal/AsyncAnalysis.scala
index 15ddf48..6540bdb 100644
--- a/src/main/scala/scala/async/internal/AsyncAnalysis.scala
+++ b/src/main/scala/scala/async/internal/AsyncAnalysis.scala
@@ -10,7 +10,7 @@ import scala.collection.mutable
trait AsyncAnalysis {
self: AsyncMacro =>
- import global._
+ import c.universe._
/**
* Analyze the contents of an `async` block in order to:
@@ -21,14 +21,14 @@ trait AsyncAnalysis {
def reportUnsupportedAwaits(tree: Tree): Unit = {
val analyzer = new UnsupportedAwaitAnalyzer
analyzer.traverse(tree)
- analyzer.hasUnsupportedAwaits
+ // analyzer.hasUnsupportedAwaits // XB: not used?!
}
private class UnsupportedAwaitAnalyzer extends AsyncTraverser {
var hasUnsupportedAwaits = false
override def nestedClass(classDef: ClassDef) {
- val kind = if (classDef.symbol.isTrait) "trait" else "class"
+ val kind = if (classDef.symbol.asClass.isTrait) "trait" else "class"
reportUnsupportedAwait(classDef, s"nested ${kind}")
}
@@ -59,7 +59,7 @@ trait AsyncAnalysis {
reportUnsupportedAwait(tree, "try/catch")
super.traverse(tree)
case Return(_) =>
- abort(tree.pos, "return is illegal within a async block")
+ c.abort(tree.pos, "return is illegal within a async block")
case DefDef(mods, _, _, _, _, _) if mods.hasFlag(Flag.LAZY) && containsAwait =>
reportUnsupportedAwait(tree, "lazy val initializer")
case CaseDef(_, guard, _) if guard exists isAwait =>
@@ -86,7 +86,7 @@ trait AsyncAnalysis {
private def reportError(pos: Position, msg: String) {
hasUnsupportedAwaits = true
- abort(pos, msg)
+ c.abort(pos, msg)
}
}
}