diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2012-11-13 15:41:45 -0800 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2012-11-13 15:41:45 -0800 |
| commit | ea87ecbe818f7445156d6c2548e429a8ca54595d (patch) | |
| tree | bd22ab5b263953982d0028da8f49efd671d8d18d /src/compiler | |
| parent | 8b598436f64ca4e980c8a38f642085b4d23e2327 (diff) | |
| parent | 45cf745ccfe5b3729be70dee604beb0b7b411faf (diff) | |
| download | scala-ea87ecbe818f7445156d6c2548e429a8ca54595d.tar.gz scala-ea87ecbe818f7445156d6c2548e429a8ca54595d.tar.bz2 scala-ea87ecbe818f7445156d6c2548e429a8ca54595d.zip | |
Merge pull request #1606 from retronym/ticket/6646
SI-6646 Fix regression in for desugaring.
Diffstat (limited to 'src/compiler')
| -rw-r--r-- | src/compiler/scala/tools/nsc/ast/parser/TreeBuilder.scala | 2 |
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) |