Generalized PhasesSetting to accept "all" as a ...

Generalized PhasesSetting to accept "all" as a phase and then apply
that setting to all phases. Implements ticket #924, primarily for
-Yprint:all. Removed option -Ylog-all as an unnecessary special case
(use -Ylog:all instead.)

1 files changed, 6 insertions, 7 deletions

diff --git a/src/compiler/scala/tools/nsc/Global.scala b/src/compiler/scala/tools/nsc/Global.scala
index ecd7bdc6de..2a4e024a21 100644
--- a/src/compiler/scala/tools/nsc/Global.scala
+++ b/src/compiler/scala/tools/nsc/Global.scala
@@ -126,8 +126,7 @@ class Global(var settings: Settings, var reporter: Reporter) extends SymbolTable
     informProgress(msg + " in " + (currentTime - start) + "ms")
 
   def log(msg: AnyRef) {
-    if (settings.logAll.value || (settings.log contains phase.name))
-      inform("[log " + phase + "] " + msg)
+    if (settings.log contains phase.name) inform("[log " + phase + "] " + msg)
   }
 
   class ErrorWithPosition(val pos: Int, val error: Throwable) extends Error
@@ -686,15 +685,15 @@ class Global(var settings: Settings, var reporter: Reporter) extends SymbolTable
         informTime(globalPhase.description, startTime)
         globalPhase = globalPhase.next
 
-        if ((settings.check contains globalPhase.prev.name) ||
-	    (settings.check contains "all")) {
+        if (settings.check contains globalPhase.prev.name) {
           if (globalPhase.prev.checkable) {
             phase = globalPhase
             if (globalPhase.id >= icodePhase.id) icodeChecker.checkICodes
             else checker.checkTrees
-	  } else if (!(settings.check contains "all")) {
-            warning("It is not possible to check the result of the "+globalPhase.name+" phase")
-	  }
+      	  }
+      	  else if (!settings.check.doAllPhases) {
+      	    warning("It is not possible to check the result of the "+globalPhase.name+" phase")
+          }
         }
 
         if (settings.statistics.value) statistics.print(phase)