Made -Xfatal-warnings less immediately fatal.

Instead of changing warnings to errors mid-stream, at the end of
a run I check for condition "no errors, some warnings, and fatal
warnings" and then generate an error at that point.  This is
necessary to test for some warnings which come from later stages.

1 files changed, 54 insertions, 52 deletions

diff --git a/test/files/neg/macro-deprecate-idents.check b/test/files/neg/macro-deprecate-idents.check
index f8a7e519df..c653eabaef 100644
--- a/test/files/neg/macro-deprecate-idents.check
+++ b/test/files/neg/macro-deprecate-idents.check
@@ -1,52 +1,54 @@
-macro-deprecate-idents.scala:2: error: macro is now a reserved word; usage as an identifier is deprecated

-  val macro = ???

-      ^

-macro-deprecate-idents.scala:6: error: macro is now a reserved word; usage as an identifier is deprecated

-  var macro = ???

-      ^

-macro-deprecate-idents.scala:10: error: macro is now a reserved word; usage as an identifier is deprecated

-  type macro = Int

-       ^

-macro-deprecate-idents.scala:14: error: macro is now a reserved word; usage as an identifier is deprecated

-  class macro

-        ^

-macro-deprecate-idents.scala:18: error: macro is now a reserved word; usage as an identifier is deprecated

-  class macro

-        ^

-macro-deprecate-idents.scala:22: error: macro is now a reserved word; usage as an identifier is deprecated

-  object macro

-         ^

-macro-deprecate-idents.scala:26: error: macro is now a reserved word; usage as an identifier is deprecated

-  object macro

-         ^

-macro-deprecate-idents.scala:30: error: macro is now a reserved word; usage as an identifier is deprecated

-  trait macro

-        ^

-macro-deprecate-idents.scala:34: error: macro is now a reserved word; usage as an identifier is deprecated

-  trait macro

-        ^

-macro-deprecate-idents.scala:37: error: macro is now a reserved word; usage as an identifier is deprecated

-package macro {

-        ^

-macro-deprecate-idents.scala:38: error: macro is now a reserved word; usage as an identifier is deprecated

-  package macro.bar {

-          ^

-macro-deprecate-idents.scala:43: error: macro is now a reserved word; usage as an identifier is deprecated

-  package macro.foo {

-          ^

-macro-deprecate-idents.scala:48: error: macro is now a reserved word; usage as an identifier is deprecated

-  val Some(macro) = Some(42)

-           ^

-macro-deprecate-idents.scala:49: error: macro is now a reserved word; usage as an identifier is deprecated

-  macro match {

-  ^

-macro-deprecate-idents.scala:50: error: macro is now a reserved word; usage as an identifier is deprecated

-    case macro => println(macro)

-         ^

-macro-deprecate-idents.scala:50: error: macro is now a reserved word; usage as an identifier is deprecated

-    case macro => println(macro)

-                          ^

-macro-deprecate-idents.scala:55: error: macro is now a reserved word; usage as an identifier is deprecated

-  def macro = 2

-      ^

-17 errors found

+macro-deprecate-idents.scala:2: warning: macro is now a reserved word; usage as an identifier is deprecated
+  val macro = ???
+      ^
+macro-deprecate-idents.scala:6: warning: macro is now a reserved word; usage as an identifier is deprecated
+  var macro = ???
+      ^
+macro-deprecate-idents.scala:10: warning: macro is now a reserved word; usage as an identifier is deprecated
+  type macro = Int
+       ^
+macro-deprecate-idents.scala:14: warning: macro is now a reserved word; usage as an identifier is deprecated
+  class macro
+        ^
+macro-deprecate-idents.scala:18: warning: macro is now a reserved word; usage as an identifier is deprecated
+  class macro
+        ^
+macro-deprecate-idents.scala:22: warning: macro is now a reserved word; usage as an identifier is deprecated
+  object macro
+         ^
+macro-deprecate-idents.scala:26: warning: macro is now a reserved word; usage as an identifier is deprecated
+  object macro
+         ^
+macro-deprecate-idents.scala:30: warning: macro is now a reserved word; usage as an identifier is deprecated
+  trait macro
+        ^
+macro-deprecate-idents.scala:34: warning: macro is now a reserved word; usage as an identifier is deprecated
+  trait macro
+        ^
+macro-deprecate-idents.scala:37: warning: macro is now a reserved word; usage as an identifier is deprecated
+package macro {
+        ^
+macro-deprecate-idents.scala:38: warning: macro is now a reserved word; usage as an identifier is deprecated
+  package macro.bar {
+          ^
+macro-deprecate-idents.scala:43: warning: macro is now a reserved word; usage as an identifier is deprecated
+  package macro.foo {
+          ^
+macro-deprecate-idents.scala:48: warning: macro is now a reserved word; usage as an identifier is deprecated
+  val Some(macro) = Some(42)
+           ^
+macro-deprecate-idents.scala:49: warning: macro is now a reserved word; usage as an identifier is deprecated
+  macro match {
+  ^
+macro-deprecate-idents.scala:50: warning: macro is now a reserved word; usage as an identifier is deprecated
+    case macro => println(macro)
+         ^
+macro-deprecate-idents.scala:50: warning: macro is now a reserved word; usage as an identifier is deprecated
+    case macro => println(macro)
+                          ^
+macro-deprecate-idents.scala:55: warning: macro is now a reserved word; usage as an identifier is deprecated
+  def macro = 2
+      ^
+error: No warnings can be incurred under -Xfatal-warnings.
+17 warnings found
+one error found