diff options
| author | Adriaan Moors <adriaanm@gmail.com> | 2012-05-04 06:56:43 -0700 |
|---|---|---|
| committer | Adriaan Moors <adriaanm@gmail.com> | 2012-05-04 06:56:43 -0700 |
| commit | e52be82eefbe8844d43e6045fbdc3c6db5f6aaef (patch) | |
| tree | 6bb77955e55753e4db51723121f571118b9199e9 | |
| parent | 01f6ed8e22d02811fe62b9183d9f84bdda5ede4b (diff) | |
| parent | 82185387328454e8f06110eadeccd5634d18f998 (diff) | |
| download | scala-e52be82eefbe8844d43e6045fbdc3c6db5f6aaef.tar.gz scala-e52be82eefbe8844d43e6045fbdc3c6db5f6aaef.tar.bz2 scala-e52be82eefbe8844d43e6045fbdc3c6db5f6aaef.zip | |
Merge pull request #472 from adriaanm/topic/virtpatmat
run patmat after typer, but not *right* after
| -rw-r--r-- | src/compiler/scala/tools/nsc/Global.scala | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/Global.scala b/src/compiler/scala/tools/nsc/Global.scala index e4cfad53c7..dfab703843 100644 --- a/src/compiler/scala/tools/nsc/Global.scala +++ b/src/compiler/scala/tools/nsc/Global.scala @@ -464,13 +464,15 @@ class Global(var currentSettings: Settings, var reporter: Reporter) extends Symb object patmat extends { val global: Global.this.type = Global.this val runsAfter = List("typer") - val runsRightAfter = Some("typer") + // patmat doesn't need to be right after typer, as long as we run before supperaccesors + // (sbt does need to run right after typer, so don't conflict) + val runsRightAfter = None } with PatternMatching // phaseName = "superaccessors" object superAccessors extends { val global: Global.this.type = Global.this - val runsAfter = List("typer") + val runsAfter = List("patmat") val runsRightAfter = None } with SuperAccessors |