macros: -Xmacros is now retired

14 files changed, 13 insertions, 15 deletions

diff --git a/build.xml b/build.xml
index 35cc4f3004..28c323d7a1 100644
--- a/build.xml
+++ b/build.xml
@@ -334,7 +334,7 @@ INITIALISATION
   <target name="init.version.done" depends="init.version.release, init.version.snapshot"/>
 
   <target name="init" depends="init.jars, init.maven.jars, init.version.done">
-    <property name="scalac.args.always" value="-Xmacros" />
+    <property name="scalac.args.always" value="" />
   <!-- scalac.args.optimise is selectively overridden in certain antcall tasks. -->
     <property name="scalac.args.optimise" value=""/>
   <!-- scalac.args.quickonly are added to quick.* targets but not others (particularly, locker.)
diff --git a/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala b/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala
index 43560f9d8d..226c17f10d 100644
--- a/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala
+++ b/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala
@@ -2534,8 +2534,7 @@ self =>
           } else {
             if (in.token == EQUALS) {
               in.nextTokenAllow(nme.MACROkw)
-              if (settings.Xmacros.value && in.token == MACRO || // [Martin] Xmacros can be retired now
-                  in.token == IDENTIFIER && in.name == nme.MACROkw) {
+              if (in.token == IDENTIFIER && in.name == nme.MACROkw) {
                 in.nextToken()
                 newmods |= Flags.MACRO
               }
diff --git a/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala b/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala
index 88a89d54eb..cd1a808823 100644
--- a/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala
+++ b/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala
@@ -203,7 +203,6 @@ trait ScalaSettings extends AbsScalaSettings
   val Xexperimental = BooleanSetting("-Xexperimental", "Enable experimental extensions.") enabling experimentalSettings
 
   // Feature extensions
-  val Xmacros                 = BooleanSetting("-Xmacros", "Enable macros.") // [Martin] Can be retired now.
   val XmacroSettings          = MultiStringSetting("-Xmacro-settings", "option", "Custom settings for macros.")
   val XmacroPrimaryClasspath  = PathSetting("-Xmacro-primary-classpath", "Classpath to load macros implementations from, defaults to compilation classpath (aka \"library classpath\".", "")
   val XmacroFallbackClasspath = PathSetting("-Xmacro-fallback-classpath", "Classpath to load macros implementations from if they cannot be loaded from library classpath.", "")
diff --git a/test/pending/run/macro-expand-default.flags b/test/pending/run/macro-expand-default.flags
index 7fea2ff901..cd66464f2f 100644
--- a/test/pending/run/macro-expand-default.flags
+++ b/test/pending/run/macro-expand-default.flags
@@ -1 +1 @@
--Xmacros
\ No newline at end of file
+-language:experimental.macros
\ No newline at end of file
diff --git a/test/pending/run/macro-expand-implicit-macro-has-context-bound.flags b/test/pending/run/macro-expand-implicit-macro-has-context-bound.flags
index 7fea2ff901..cd66464f2f 100644
--- a/test/pending/run/macro-expand-implicit-macro-has-context-bound.flags
+++ b/test/pending/run/macro-expand-implicit-macro-has-context-bound.flags
@@ -1 +1 @@
--Xmacros
\ No newline at end of file
+-language:experimental.macros
\ No newline at end of file
diff --git a/test/pending/run/macro-expand-named.flags b/test/pending/run/macro-expand-named.flags
index 7fea2ff901..cd66464f2f 100644
--- a/test/pending/run/macro-expand-named.flags
+++ b/test/pending/run/macro-expand-named.flags
@@ -1 +1 @@
--Xmacros
\ No newline at end of file
+-language:experimental.macros
\ No newline at end of file
diff --git a/test/pending/run/macro-expand-tparams-prefix-e1.flags b/test/pending/run/macro-expand-tparams-prefix-e1.flags
index 7fea2ff901..cd66464f2f 100644
--- a/test/pending/run/macro-expand-tparams-prefix-e1.flags
+++ b/test/pending/run/macro-expand-tparams-prefix-e1.flags
@@ -1 +1 @@
--Xmacros
\ No newline at end of file
+-language:experimental.macros
\ No newline at end of file
diff --git a/test/pending/run/macro-expand-tparams-prefix-f1.flags b/test/pending/run/macro-expand-tparams-prefix-f1.flags
index 7fea2ff901..cd66464f2f 100644
--- a/test/pending/run/macro-expand-tparams-prefix-f1.flags
+++ b/test/pending/run/macro-expand-tparams-prefix-f1.flags
@@ -1 +1 @@
--Xmacros
\ No newline at end of file
+-language:experimental.macros
\ No newline at end of file
diff --git a/test/pending/run/macro-quasiinvalidbody-a.flags b/test/pending/run/macro-quasiinvalidbody-a.flags
index 7fea2ff901..cd66464f2f 100644
--- a/test/pending/run/macro-quasiinvalidbody-a.flags
+++ b/test/pending/run/macro-quasiinvalidbody-a.flags
@@ -1 +1 @@
--Xmacros
\ No newline at end of file
+-language:experimental.macros
\ No newline at end of file
diff --git a/test/pending/run/macro-quasiinvalidbody-b.flags b/test/pending/run/macro-quasiinvalidbody-b.flags
index 7fea2ff901..cd66464f2f 100644
--- a/test/pending/run/macro-quasiinvalidbody-b.flags
+++ b/test/pending/run/macro-quasiinvalidbody-b.flags
@@ -1 +1 @@
--Xmacros
\ No newline at end of file
+-language:experimental.macros
\ No newline at end of file
diff --git a/test/pending/run/macro-reify-array.flags b/test/pending/run/macro-reify-array.flags
index 7fea2ff901..cd66464f2f 100644
--- a/test/pending/run/macro-reify-array.flags
+++ b/test/pending/run/macro-reify-array.flags
@@ -1 +1 @@
--Xmacros
\ No newline at end of file
+-language:experimental.macros
\ No newline at end of file
diff --git a/test/pending/run/macro-reify-eval-vs-value.flags b/test/pending/run/macro-reify-eval-vs-value.flags
index 7fea2ff901..cd66464f2f 100644
--- a/test/pending/run/macro-reify-eval-vs-value.flags
+++ b/test/pending/run/macro-reify-eval-vs-value.flags
@@ -1 +1 @@
--Xmacros
\ No newline at end of file
+-language:experimental.macros
\ No newline at end of file
diff --git a/test/pending/run/macro-reify-tagful-b.flags b/test/pending/run/macro-reify-tagful-b.flags
index 7fea2ff901..cd66464f2f 100644
--- a/test/pending/run/macro-reify-tagful-b.flags
+++ b/test/pending/run/macro-reify-tagful-b.flags
@@ -1 +1 @@
--Xmacros
\ No newline at end of file
+-language:experimental.macros
\ No newline at end of file
diff --git a/test/pending/run/macro-reify-tagless-b.flags b/test/pending/run/macro-reify-tagless-b.flags
index 7fea2ff901..cd66464f2f 100644
--- a/test/pending/run/macro-reify-tagless-b.flags
+++ b/test/pending/run/macro-reify-tagless-b.flags
@@ -1 +1 @@
--Xmacros
\ No newline at end of file
+-language:experimental.macros
\ No newline at end of file