diff options
| author | Eugene Burmako <xeno.by@gmail.com> | 2011-12-21 14:25:55 +0100 |
|---|---|---|
| committer | Eugene Burmako <xeno.by@gmail.com> | 2011-12-21 14:25:55 +0100 |
| commit | 541a6692c2b4124491fa43fe3a1455c9cf7d7042 (patch) | |
| tree | 1d21826a5d10736bd1421da2a205ac00ae04889b /src/compiler/scala/tools/nsc/Global.scala | |
| parent | 178d49df450904330c06cfea9955f120ba04d34c (diff) | |
| download | scala-541a6692c2b4124491fa43fe3a1455c9cf7d7042.tar.gz scala-541a6692c2b4124491fa43fe3a1455c9cf7d7042.tar.bz2 scala-541a6692c2b4124491fa43fe3a1455c9cf7d7042.zip | |
Made -Ystop-after:parser work correctly
Without this fix running a compiler with the aforementioned option
leads to a crash (because namerPhase gets resolved to a NoPhase).
Diffstat (limited to 'src/compiler/scala/tools/nsc/Global.scala')
| -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 f14474eda8..90b4da8c9a 100644 --- a/src/compiler/scala/tools/nsc/Global.scala +++ b/src/compiler/scala/tools/nsc/Global.scala @@ -1201,8 +1201,10 @@ class Global(var currentSettings: Settings, var reporter: Reporter) extends Symb perRunCaches.clearAll() // Reset project - atPhase(namerPhase) { - resetProjectClasses(definitions.RootClass) + if (!stopPhase("namer")) { + atPhase(namerPhase) { + resetProjectClasses(definitions.RootClass) + } } } |