diff options
author | Adriaan Moors <adriaan.moors@typesafe.com> | 2012-11-25 13:31:52 -0800 |
---|---|---|
committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2012-11-25 13:31:52 -0800 |
commit | b8f06f33a420cf07f980cab61b2a11df6a0f5dca (patch) | |
tree | 939c690f926c712c68eff3f04c1f6c34bbea6bfc /src/compiler/scala/tools/nsc/ast/parser/TreeBuilder.scala | |
parent | 8630176e985c5a8266d3afe4c4e3fb50d449630d (diff) | |
parent | faa6cfcf404b4d172f20b3ed01ba3bd59427b700 (diff) | |
download | scala-b8f06f33a420cf07f980cab61b2a11df6a0f5dca.tar.gz scala-b8f06f33a420cf07f980cab61b2a11df6a0f5dca.tar.bz2 scala-b8f06f33a420cf07f980cab61b2a11df6a0f5dca.zip |
Merge pull request #1663 from paulp/merge-2.10.wip-x
Merge 2.10.0-wip into 2.10.x.
Diffstat (limited to 'src/compiler/scala/tools/nsc/ast/parser/TreeBuilder.scala')
-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) |