summaryrefslogtreecommitdiff
path: root/test/files
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2012-04-14 05:01:20 +0100
committerPaul Phillips <paulp@improving.org>2012-04-14 05:01:20 +0100
commit7bd3b62ea5fc425fcf24685b6b8d8c5d1da0b8f5 (patch)
treec554301e2ee18b320051cc594e4518f76734fe45 /test/files
parent909bcb89d27cd7d7f754a02eb1f1362e0f7abe54 (diff)
downloadscala-7bd3b62ea5fc425fcf24685b6b8d8c5d1da0b8f5.tar.gz
scala-7bd3b62ea5fc425fcf24685b6b8d8c5d1da0b8f5.tar.bz2
scala-7bd3b62ea5fc425fcf24685b6b8d8c5d1da0b8f5.zip
One more macro test to disable for SIP 18.
Diffstat (limited to 'test/files')
-rw-r--r--test/files/neg/macro-deprecate-idents.check46
-rw-r--r--test/files/neg/macro-deprecate-idents.flags1
-rw-r--r--test/files/neg/macro-deprecate-idents.scala56
3 files changed, 0 insertions, 103 deletions
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