From 7bd3b62ea5fc425fcf24685b6b8d8c5d1da0b8f5 Mon Sep 17 00:00:00 2001
From: Paul Phillips <paulp@improving.org>
Date: Sat, 14 Apr 2012 05:01:20 +0100
Subject: One more macro test to disable for SIP 18.

---
 test/disabled/neg/macro-deprecate-idents.check | 46 +++++++++++++++++++++
 test/disabled/neg/macro-deprecate-idents.flags |  1 +
 test/disabled/neg/macro-deprecate-idents.scala | 56 ++++++++++++++++++++++++++
 test/files/neg/macro-deprecate-idents.check    | 46 ---------------------
 test/files/neg/macro-deprecate-idents.flags    |  1 -
 test/files/neg/macro-deprecate-idents.scala    | 56 --------------------------
 6 files changed, 103 insertions(+), 103 deletions(-)
 create mode 100644 test/disabled/neg/macro-deprecate-idents.check
 create mode 100644 test/disabled/neg/macro-deprecate-idents.flags
 create mode 100644 test/disabled/neg/macro-deprecate-idents.scala
 delete mode 100644 test/files/neg/macro-deprecate-idents.check
 delete mode 100644 test/files/neg/macro-deprecate-idents.flags
 delete mode 100644 test/files/neg/macro-deprecate-idents.scala

(limited to 'test')

diff --git a/test/disabled/neg/macro-deprecate-idents.check b/test/disabled/neg/macro-deprecate-idents.check
new file mode 100644
index 0000000000..bd685fc7b9
--- /dev/null
+++ b/test/disabled/neg/macro-deprecate-idents.check
@@ -0,0 +1,46 @@
+macro-deprecate-idents.scala:2: error: in future versions of Scala "macro" will be a keyword. consider using a different name.
+  val macro = ???
+      ^
+macro-deprecate-idents.scala:6: error: in future versions of Scala "macro" will be a keyword. consider using a different name.
+  var macro = ???
+      ^
+macro-deprecate-idents.scala:10: error: in future versions of Scala "macro" will be a keyword. consider using a different name.
+  type macro = Int
+       ^
+macro-deprecate-idents.scala:14: error: in future versions of Scala "macro" will be a keyword. consider using a different name.
+  class macro
+        ^
+macro-deprecate-idents.scala:18: error: in future versions of Scala "macro" will be a keyword. consider using a different name.
+  class macro
+        ^
+macro-deprecate-idents.scala:22: error: in future versions of Scala "macro" will be a keyword. consider using a different name.
+  object macro
+         ^
+macro-deprecate-idents.scala:26: error: in future versions of Scala "macro" will be a keyword. consider using a different name.
+  object macro
+         ^
+macro-deprecate-idents.scala:30: error: in future versions of Scala "macro" will be a keyword. consider using a different name.
+  trait macro
+        ^
+macro-deprecate-idents.scala:34: error: in future versions of Scala "macro" will be a keyword. consider using a different name.
+  trait macro
+        ^
+macro-deprecate-idents.scala:37: error: in future versions of Scala "macro" will be a keyword. consider using a different name.
+package macro {
+        ^
+macro-deprecate-idents.scala:38: error: in future versions of Scala "macro" will be a keyword. consider using a different name.
+  package macro.bar {
+          ^
+macro-deprecate-idents.scala:43: error: in future versions of Scala "macro" will be a keyword. consider using a different name.
+  package macro.foo {
+          ^
+macro-deprecate-idents.scala:48: error: in future versions of Scala "macro" will be a keyword. consider using a different name.
+  val Some(macro) = Some(42)
+           ^
+macro-deprecate-idents.scala:50: error: in future versions of Scala "macro" will be a keyword. consider using a different name.
+    case macro => println(macro)
+         ^
+macro-deprecate-idents.scala:55: error: in future versions of Scala "macro" will be a keyword. consider using a different name.
+  def macro = 2
+      ^
+15 errors found
diff --git a/test/disabled/neg/macro-deprecate-idents.flags b/test/disabled/neg/macro-deprecate-idents.flags
new file mode 100644
index 0000000000..e8fb65d50c
--- /dev/null
+++ b/test/disabled/neg/macro-deprecate-idents.flags
@@ -0,0 +1 @@
+-Xfatal-warnings
\ No newline at end of file
diff --git a/test/disabled/neg/macro-deprecate-idents.scala b/test/disabled/neg/macro-deprecate-idents.scala
new file mode 100644
index 0000000000..23c398e341
--- /dev/null
+++ b/test/disabled/neg/macro-deprecate-idents.scala
@@ -0,0 +1,56 @@
+object Test1 {
+  val macro = ???
+}
+
+object Test2 {
+  var macro = ???
+}
+
+object Test3 {
+  type macro = Int
+}
+
+package test4 {
+  class macro
+}
+
+object Test5 {
+  class macro
+}
+
+package test6 {
+  object macro
+}
+
+object Test7 {
+  object macro
+}
+
+package test8 {
+  trait macro
+}
+
+object Test9 {
+  trait macro
+}
+
+package macro {
+  package macro.bar {
+  }
+}
+
+package foo {
+  package macro.foo {
+  }
+}
+
+object Test12 {
+  val Some(macro) = Some(42)
+  macro match {
+    case macro => println(macro)
+  }
+}
+
+object Test13 {
+  def macro = 2
+}
\ No newline at end of file
diff --git a/test/files/neg/macro-deprecate-idents.check b/test/files/neg/macro-deprecate-idents.check
deleted file mode 100644
index bd685fc7b9..0000000000
--- a/test/files/neg/macro-deprecate-idents.check
+++ /dev/null
@@ -1,46 +0,0 @@
-macro-deprecate-idents.scala:2: error: in future versions of Scala "macro" will be a keyword. consider using a different name.
-  val macro = ???
-      ^
-macro-deprecate-idents.scala:6: error: in future versions of Scala "macro" will be a keyword. consider using a different name.
-  var macro = ???
-      ^
-macro-deprecate-idents.scala:10: error: in future versions of Scala "macro" will be a keyword. consider using a different name.
-  type macro = Int
-       ^
-macro-deprecate-idents.scala:14: error: in future versions of Scala "macro" will be a keyword. consider using a different name.
-  class macro
-        ^
-macro-deprecate-idents.scala:18: error: in future versions of Scala "macro" will be a keyword. consider using a different name.
-  class macro
-        ^
-macro-deprecate-idents.scala:22: error: in future versions of Scala "macro" will be a keyword. consider using a different name.
-  object macro
-         ^
-macro-deprecate-idents.scala:26: error: in future versions of Scala "macro" will be a keyword. consider using a different name.
-  object macro
-         ^
-macro-deprecate-idents.scala:30: error: in future versions of Scala "macro" will be a keyword. consider using a different name.
-  trait macro
-        ^
-macro-deprecate-idents.scala:34: error: in future versions of Scala "macro" will be a keyword. consider using a different name.
-  trait macro
-        ^
-macro-deprecate-idents.scala:37: error: in future versions of Scala "macro" will be a keyword. consider using a different name.
-package macro {
-        ^
-macro-deprecate-idents.scala:38: error: in future versions of Scala "macro" will be a keyword. consider using a different name.
-  package macro.bar {
-          ^
-macro-deprecate-idents.scala:43: error: in future versions of Scala "macro" will be a keyword. consider using a different name.
-  package macro.foo {
-          ^
-macro-deprecate-idents.scala:48: error: in future versions of Scala "macro" will be a keyword. consider using a different name.
-  val Some(macro) = Some(42)
-           ^
-macro-deprecate-idents.scala:50: error: in future versions of Scala "macro" will be a keyword. consider using a different name.
-    case macro => println(macro)
-         ^
-macro-deprecate-idents.scala:55: error: in future versions of Scala "macro" will be a keyword. consider using a different name.
-  def macro = 2
-      ^
-15 errors found
diff --git a/test/files/neg/macro-deprecate-idents.flags b/test/files/neg/macro-deprecate-idents.flags
deleted file mode 100644
index e8fb65d50c..0000000000
--- a/test/files/neg/macro-deprecate-idents.flags
+++ /dev/null
@@ -1 +0,0 @@
--Xfatal-warnings
\ No newline at end of file
diff --git a/test/files/neg/macro-deprecate-idents.scala b/test/files/neg/macro-deprecate-idents.scala
deleted file mode 100644
index 23c398e341..0000000000
--- a/test/files/neg/macro-deprecate-idents.scala
+++ /dev/null
@@ -1,56 +0,0 @@
-object Test1 {
-  val macro = ???
-}
-
-object Test2 {
-  var macro = ???
-}
-
-object Test3 {
-  type macro = Int
-}
-
-package test4 {
-  class macro
-}
-
-object Test5 {
-  class macro
-}
-
-package test6 {
-  object macro
-}
-
-object Test7 {
-  object macro
-}
-
-package test8 {
-  trait macro
-}
-
-object Test9 {
-  trait macro
-}
-
-package macro {
-  package macro.bar {
-  }
-}
-
-package foo {
-  package macro.foo {
-  }
-}
-
-object Test12 {
-  val Some(macro) = Some(42)
-  macro match {
-    case macro => println(macro)
-  }
-}
-
-object Test13 {
-  def macro = 2
-}
\ No newline at end of file
-- 
cgit v1.2.3