diff options
| -rw-r--r-- | sources/scalac/transformer/matching/PatternMatcher.java | 3 | ||||
| -rw-r--r-- | sources/scalac/transformer/matching/SequenceMatcher.java | 16 |
2 files changed, 8 insertions, 11 deletions
diff --git a/sources/scalac/transformer/matching/PatternMatcher.java b/sources/scalac/transformer/matching/PatternMatcher.java index 4dd59ea4ea..e7e8b72cf4 100644 --- a/sources/scalac/transformer/matching/PatternMatcher.java +++ b/sources/scalac/transformer/matching/PatternMatcher.java @@ -295,8 +295,9 @@ public class PatternMatcher extends PatternTool { } else if ((fn.symbol() != null) && fn.symbol().isStable() && !(fn.symbol().isModule() && - ((fn.symbol().flags & Modifiers.CASE) != 0))) + ((fn.symbol().flags & Modifiers.CASE) != 0))) { return mk.VariablePat(tree.pos, tree); + } return mk.ConstrPat(tree.pos, tree.type); case Typed(Ident ident, Tree tpe): // variable pattern boolean doTest = header.type.isSubType(tpe.type); diff --git a/sources/scalac/transformer/matching/SequenceMatcher.java b/sources/scalac/transformer/matching/SequenceMatcher.java index 682320dce3..84f85a151a 100644 --- a/sources/scalac/transformer/matching/SequenceMatcher.java +++ b/sources/scalac/transformer/matching/SequenceMatcher.java @@ -27,9 +27,6 @@ public class SequenceMatcher extends PatternTool { PartialMatcher _m; - //Tree pat[]; - //Tree body[]; - BindingBerrySethi bbuild = null; /** translates the det/switching automaton to scala code @@ -98,8 +95,6 @@ public class SequenceMatcher extends PatternTool { Tree defaultCase, boolean doBinding ) { this._m = _m; - //this.pat = pat; - //this.body = body; assert body.length == pat.length; if( defaultCase == null ) defaultCase = cf.ThrowMatchError( cf.pos, _m.resultType ); @@ -125,11 +120,12 @@ public class SequenceMatcher extends PatternTool { DetWordAutom dfa = new DetWordAutom( nfa ); // (c) translate to scala code - WordAutomInScala scalaAut = new WordAutomInScala( dfa, - elementType, - _m.owner, - cf, - unit.global.target == Global.TARGET_JVM ); + WordAutomInScala scalaAut = + new WordAutomInScala( dfa, + elementType, + _m.owner, + cf, + unit.global.target == Global.TARGET_JVM ); scalaAut.translate(); // STEP 3 - binding |