diff options
| -rw-r--r-- | src/compiler/scala/tools/nsc/settings/ScalaSettings.scala | 10 | ||||
| -rw-r--r-- | test/files/jvm/bytecode-test-example/Foo_1.flags | 2 | ||||
| -rw-r--r-- | test/files/jvm/nooptimise/Foo_1.flags | 2 | ||||
| -rw-r--r-- | test/files/neg/case-collision.flags | 2 | ||||
| -rw-r--r-- | test/files/neg/case-collision2.flags | 2 | ||||
| -rw-r--r-- | test/files/run/t7008-scala-defined.flags | 2 |
6 files changed, 10 insertions, 10 deletions
diff --git a/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala b/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala index ae105ac1a1..321baba562 100644 --- a/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala +++ b/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala @@ -201,9 +201,9 @@ trait ScalaSettings extends AbsScalaSettings /** * Settings motivated by GenBCode */ - val neo = ChoiceSetting ("-neo", "choice of bytecode emitter", "Choice of bytecode emitter.", - List("GenASM", "GenBCode"), - "GenASM") + val Ybackend = ChoiceSetting ("-Ybackend", "choice of bytecode emitter", "Choice of bytecode emitter.", + List("GenASM", "GenBCode"), + "GenASM") // Feature extensions val XmacroSettings = MultiStringSetting("-Xmacro-settings", "option", "Custom settings for macros.") @@ -231,7 +231,7 @@ trait ScalaSettings extends AbsScalaSettings * Helper utilities for use by checkConflictingSettings() */ def isBCodeActive = !isICodeAskedFor - def isBCodeAskedFor = (neo.value != "GenASM") - def isICodeAskedFor = { (neo.value == "GenASM") || optimiseSettings.exists(_.value) || writeICode.isSetByUser } + def isBCodeAskedFor = (Ybackend.value != "GenASM") + def isICodeAskedFor = ((Ybackend.value == "GenASM") || optimiseSettings.exists(_.value) || writeICode.isSetByUser) } diff --git a/test/files/jvm/bytecode-test-example/Foo_1.flags b/test/files/jvm/bytecode-test-example/Foo_1.flags index dd8d97d718..49f2d2c4c8 100644 --- a/test/files/jvm/bytecode-test-example/Foo_1.flags +++ b/test/files/jvm/bytecode-test-example/Foo_1.flags @@ -1 +1 @@ --neo:GenASM +-Ybackend:GenASM diff --git a/test/files/jvm/nooptimise/Foo_1.flags b/test/files/jvm/nooptimise/Foo_1.flags index 60388394f2..f493cf9f3f 100644 --- a/test/files/jvm/nooptimise/Foo_1.flags +++ b/test/files/jvm/nooptimise/Foo_1.flags @@ -1 +1 @@ --neo:GenASM -optimise -Ynooptimise
\ No newline at end of file +-Ybackend:GenASM -optimise -Ynooptimise
\ No newline at end of file diff --git a/test/files/neg/case-collision.flags b/test/files/neg/case-collision.flags index 39bcae8025..14c1069dee 100644 --- a/test/files/neg/case-collision.flags +++ b/test/files/neg/case-collision.flags @@ -1 +1 @@ --neo:GenASM -Xfatal-warnings +-Ybackend:GenASM -Xfatal-warnings diff --git a/test/files/neg/case-collision2.flags b/test/files/neg/case-collision2.flags index 4293599520..5bfa9da5c5 100644 --- a/test/files/neg/case-collision2.flags +++ b/test/files/neg/case-collision2.flags @@ -1 +1 @@ --Ynooptimize -neo:GenBCode -Xfatal-warnings +-Ynooptimize -Ybackend:GenBCode -Xfatal-warnings diff --git a/test/files/run/t7008-scala-defined.flags b/test/files/run/t7008-scala-defined.flags index 80f054f494..49f2d2c4c8 100644 --- a/test/files/run/t7008-scala-defined.flags +++ b/test/files/run/t7008-scala-defined.flags @@ -1 +1 @@ --neo:GenASM +-Ybackend:GenASM |