aboutsummaryrefslogtreecommitdiff
path: root/src/main/scala/scala/async/AsyncAnalysis.scala
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2012-11-23 18:19:19 +0100
committerJason Zaugg <jzaugg@gmail.com>2012-11-23 18:19:19 +0100
commitdb5fd4638c0aac51d66244404dad4dd779f184fa (patch)
tree3b39cc69e904d3021a1cbd19c31d101d48c5dbb5 /src/main/scala/scala/async/AsyncAnalysis.scala
parentf9c25fc4acac6a5965d68584d68eee7539e4ba45 (diff)
downloadscala-async-db5fd4638c0aac51d66244404dad4dd779f184fa.tar.gz
scala-async-db5fd4638c0aac51d66244404dad4dd779f184fa.tar.bz2
scala-async-db5fd4638c0aac51d66244404dad4dd779f184fa.zip
Test for await in while (currently forbidden).
Lookup the ValDef symbol from Assign#rhs.symbol.
Diffstat (limited to 'src/main/scala/scala/async/AsyncAnalysis.scala')
-rw-r--r--src/main/scala/scala/async/AsyncAnalysis.scala4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/scala/scala/async/AsyncAnalysis.scala b/src/main/scala/scala/async/AsyncAnalysis.scala
index c160776..88a1bb0 100644
--- a/src/main/scala/scala/async/AsyncAnalysis.scala
+++ b/src/main/scala/scala/async/AsyncAnalysis.scala
@@ -102,10 +102,10 @@ private[async] final case class AsyncAnalysis[C <: Context](override val c: C) e
if (isAwait(vd.rhs)) valDefsToLift += vd
case as: Assign =>
if (isAwait(as.rhs)) {
- assert(as.symbol != null, "internal error: null symbol for Assign tree:" + as)
+ assert(as.lhs.symbol != null, "internal error: null symbol for Assign tree:" + as + " " + as.lhs.symbol)
// TODO test the orElse case, try to remove the restriction.
- val (vd, defBlockId) = valDefChunkId.getOrElse(as.symbol, c.abort(as.pos, "await may only be assigned to a var/val defined in the async block. " + as.symbol))
+ val (vd, defBlockId) = valDefChunkId.getOrElse(as.lhs.symbol, c.abort(as.pos, s"await may only be assigned to a var/val defined in the async block. ${as.lhs} ${as.lhs.symbol}"))
valDefsToLift += vd
}
super.traverse(tree)