summaryrefslogtreecommitdiff
path: root/src/compiler
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2012-11-10 13:07:26 +0100
committerJason Zaugg <jzaugg@gmail.com>2012-11-10 13:13:14 +0100
commit8b2caf0746fd4405f2d47b54d17d484e6603c89d (patch)
tree452e657d03650d8760ab54ca05e0f277ea851259 /src/compiler
parent8b598436f64ca4e980c8a38f642085b4d23e2327 (diff)
downloadscala-8b2caf0746fd4405f2d47b54d17d484e6603c89d.tar.gz
scala-8b2caf0746fd4405f2d47b54d17d484e6603c89d.tar.bz2
scala-8b2caf0746fd4405f2d47b54d17d484e6603c89d.zip
SI-6646 Fix regression in for desugaring.
The early check in the parser of pattern irrefutability, added in c82ecab, failed to consider InitCaps and `backquoted` identifiers.
Diffstat (limited to 'src/compiler')
-rw-r--r--src/compiler/scala/tools/nsc/ast/parser/TreeBuilder.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/ast/parser/TreeBuilder.scala b/src/compiler/scala/tools/nsc/ast/parser/TreeBuilder.scala
index 0d13623e0c..0ac46a18bc 100644
--- a/src/compiler/scala/tools/nsc/ast/parser/TreeBuilder.scala
+++ b/src/compiler/scala/tools/nsc/ast/parser/TreeBuilder.scala
@@ -285,7 +285,7 @@ abstract class TreeBuilder {
def makeGenerator(pos: Position, pat: Tree, valeq: Boolean, rhs: Tree): Enumerator = {
val pat1 = patvarTransformer.transform(pat)
val rhs1 =
- if (valeq || treeInfo.isVariablePattern(pat)) rhs
+ if (valeq || treeInfo.isVarPatternDeep(pat)) rhs
else makeFilter(rhs, pat1.duplicate, nme.CHECK_IF_REFUTABLE_STRING)
if (valeq) ValEq(pos, pat1, rhs1)