diff options
Diffstat (limited to 'src/compiler/scala/tools/nsc/matching/TransMatcher.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/matching/TransMatcher.scala | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/compiler/scala/tools/nsc/matching/TransMatcher.scala b/src/compiler/scala/tools/nsc/matching/TransMatcher.scala index b302154ea1..e2e57ccbc2 100644 --- a/src/compiler/scala/tools/nsc/matching/TransMatcher.scala +++ b/src/compiler/scala/tools/nsc/matching/TransMatcher.scala @@ -27,7 +27,7 @@ trait TransMatcher { self: transform.ExplicitOuter with PatternNodes with CodeFa // cache these final val settings_debug = settings.debug.value - final val settings_squeeze = settings.Xmatchalgo.value != "incr" + final val settings_squeeze = settings.Xsqueeze.value == "on" final val settings_useParallel = settings.Xmatchalgo.value != "incr" final val settings_useIncr = settings.Xmatchalgo.value != "par" final val settings_casetags = settings.Xcasetags.value == "on" @@ -223,7 +223,7 @@ trait TransMatcher { self: transform.ExplicitOuter with PatternNodes with CodeFa /** handles all translation of pattern matching */ def handlePattern(sel: Tree, ocases: List[CaseDef], doCheckExhaustive: Boolean, - owner: Symbol, handleOuter: Tree => Tree): Tree = { + owner: Symbol, handleOuter: Tree => Tree, localTyper: Tree => Tree): Tree = { // TEMPORARY //new NewMatcher().toIR(sel, ocases) // @@ -239,7 +239,7 @@ trait TransMatcher { self: transform.ExplicitOuter with PatternNodes with CodeFa EmptyTree } else { val pm = new PatternMatcher() - pm.initialize(sel, doCheckExhaustive, owner,handleOuter) + pm.initialize(sel, doCheckExhaustive, owner,handleOuter, localTyper) pm.construct(cases) //if (global.log()) { // global.log("internal pattern matching structure"); |