diff options
-rw-r--r-- | sources/scalac/CompilerCommand.java | 5 | ||||
-rw-r--r-- | sources/scalac/CompilerPhases.java | 2 | ||||
-rw-r--r-- | sources/scalac/Global.java | 2 |
3 files changed, 8 insertions, 1 deletions
diff --git a/sources/scalac/CompilerCommand.java b/sources/scalac/CompilerCommand.java index cd6c8a465e..eaa0c76b7c 100644 --- a/sources/scalac/CompilerCommand.java +++ b/sources/scalac/CompilerCommand.java @@ -83,6 +83,7 @@ public class CompilerCommand extends CommandParser { */ public final BooleanOptionParser Xshortname; public final BooleanOptionParser Xmarkup; + public final BooleanOptionParser Xnewmatch; //######################################################################## // Public Constructors @@ -240,6 +241,10 @@ public class CompilerCommand extends CommandParser { "Xmarkup", "Allow XML markup in expressions and patterns", false), + this.Xnewmatch = new BooleanOptionParser(this, + "Xnewmatch", "new pattern matching", + false), + this.unknown_options = new UnknownOptionParser(this), this.files = new ScalaFileArgumentParser(this), diff --git a/sources/scalac/CompilerPhases.java b/sources/scalac/CompilerPhases.java index f2989b39bc..daaf55c34c 100644 --- a/sources/scalac/CompilerPhases.java +++ b/sources/scalac/CompilerPhases.java @@ -55,7 +55,7 @@ public abstract class CompilerPhases { protected abstract Class ANALYZER_PHASE(); protected Class REFCHECK_PHASE() { return scalac.typechecker.RefCheckPhase.class; } protected Class UNCURRY_PHASE() { return scalac.transformer.UnCurryPhase.class; } - protected Class TRANSMATCH_PHASE() { return scalac.transformer.TransMatchPhase.class; } + protected abstract Class TRANSMATCH_PHASE() ; protected Class LAMBDALIFT_PHASE() { return scalac.transformer.LambdaLiftPhase.class; } protected Class EXPLICITOUTER_PHASE() { return scalac.transformer.ExplicitOuterClassesPhase.class; } protected Class ADDACCESSORS_PHASE() { return scalac.transformer.AddAccessorsPhase.class; } diff --git a/sources/scalac/Global.java b/sources/scalac/Global.java index 156a475fbc..59f4b251b7 100644 --- a/sources/scalac/Global.java +++ b/sources/scalac/Global.java @@ -61,6 +61,7 @@ public abstract class Global { public final boolean explaintypes; public final boolean uniqid; public final boolean xmlMarkup; + public final boolean newMatch; public final boolean printtypes; public final boolean printtokens; @@ -215,6 +216,7 @@ public abstract class Global { this.debug = args.debug.value; this.uniqid = args.uniqid.value; this.xmlMarkup = args.Xmarkup.value; + this.newMatch = args.Xnewmatch.value; this.explaintypes = args.explaintypes.value; this.printtypes = args.types.value; this.printtokens = args.print.tokens; |