Permalink
Browse files

macros: -Xmacros is now retired

  • Loading branch information...
xeno-by committed Jun 5, 2012
1 parent c7491eb commit 8ca8598becf92ed712ee41c676b625412368ef94
View
@@ -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.)
@@ -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
}
@@ -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.", "")
@@ -1 +1 @@
--Xmacros
+-language:experimental.macros
@@ -1 +1 @@
--Xmacros
+-language:experimental.macros
@@ -1 +1 @@
--Xmacros
+-language:experimental.macros
@@ -1 +1 @@
--Xmacros
+-language:experimental.macros
@@ -1 +1 @@
--Xmacros
+-language:experimental.macros
@@ -1 +1 @@
--Xmacros
+-language:experimental.macros
@@ -1 +1 @@
--Xmacros
+-language:experimental.macros
@@ -1 +1 @@
--Xmacros
+-language:experimental.macros
@@ -1 +1 @@
--Xmacros
+-language:experimental.macros
@@ -1 +1 @@
--Xmacros
+-language:experimental.macros
@@ -1 +1 @@
--Xmacros
+-language:experimental.macros

0 comments on commit 8ca8598

Please sign in to comment.