Merge pull request #3547 from dotty-staging/refactor-scala-settings

Normalize scala settings names

Author: allanrenucci

compiler/src/dotty/tools/backend/jvm/DottyBackendInterface.scala

@@ -402,14 +402,14 @@ class DottyBackendInterface(outputDirectory: AbstractFile, val superCallsMap: Ma
     else Some(ctx.settings.Ydumpclasses.value)
 
   def mainClass: Option[String] =
-    if (ctx.settings.mainClass.isDefault) None
-    else Some(ctx.settings.mainClass.value)
-  def setMainClass(name: String): Unit = ctx.settings.mainClass.update(name)
+    if (ctx.settings.XmainClass.isDefault) None
+    else Some(ctx.settings.XmainClass.value)
+  def setMainClass(name: String): Unit = ctx.settings.XmainClass.update(name)
 
 
-  def noForwarders: Boolean = ctx.settings.noForwarders.value
+  def noForwarders: Boolean = ctx.settings.XnoForwarders.value
   def debuglevel: Int = 3 // 0 -> no debug info; 1-> filename; 2-> lines; 3-> varnames
-  def settings_debug: Boolean = ctx.settings.debug.value
+  def settings_debug: Boolean = ctx.settings.Ydebug.value
   def targetPlatform: String = ctx.settings.target.value
 
   val perRunCaches: Caches = new Caches {

compiler/src/dotty/tools/backend/jvm/GenBCode.scala

@@ -225,7 +225,7 @@ class GenBCodePipeline(val entryPoints: List[Symbol], val int: DottyBackendInter
           for (binary <- ctx.compilationUnit.pickled.get(claszSymbol.asClass)) {
             val store = if (mirrorC ne null) mirrorC else plainC
             val tasty =
-              if (ctx.settings.emitTasty.value) {
+              if (ctx.settings.YemitTasty.value) {
                 val outTastyFile = getFileForClassfile(outF, store.name, ".tasty")
                 val outstream = new DataOutputStream(outTastyFile.bufferedOutput)
                 try outstream.write(binary)

compiler/src/dotty/tools/dotc/Bench.scala

@@ -20,7 +20,7 @@ object Bench extends Driver {
       val start = System.nanoTime()
       val r = super.doCompile(compiler, fileNames)
       println(s"time elapsed: ${(System.nanoTime - start) / 1000000}ms")
-      if (ctx.settings.prompt.value) {
+      if (ctx.settings.Xprompt.value) {
         print("hit <return> to continue >")
         System.in.read()
         println()

compiler/src/dotty/tools/dotc/config/ScalaSettings.scala

@@ -51,35 +51,35 @@ class ScalaSettings extends Settings.SettingGroup {
   /** -X "Advanced" settings
    */
   val Xhelp = BooleanSetting("-X", "Print a synopsis of advanced options.")
-  val noForwarders = BooleanSetting("-Xno-forwarders", "Do not generate static forwarders in mirror classes.")
+  val XnoForwarders = BooleanSetting("-Xno-forwarders", "Do not generate static forwarders in mirror classes.")
   val XminImplicitSearchDepth = IntSetting("-Xmin-implicit-search-depth", "Set number of levels of implicit searches undertaken before checking for divergence.", 5)
   val xmaxInlines = IntSetting("-Xmax-inlines", "Maximal number of successive inlines", 32)
-  val maxClassfileName = IntSetting("-Xmax-classfile-name", "Maximum filename length for generated classes", 255, 72 to 255)
+  val XmaxClassfileName = IntSetting("-Xmax-classfile-name", "Maximum filename length for generated classes", 255, 72 to 255)
   val Xmigration = VersionSetting("-Xmigration", "Warn about constructs whose behavior may have changed since version.")
   val Xprint = PhasesSetting("-Xprint", "Print out program after")
-  val printtypes = BooleanSetting("-Xprint-types", "Print tree types (debugging option).")
+  val XprintTypes = BooleanSetting("-Xprint-types", "Print tree types (debugging option).")
   val XprintDiff = BooleanSetting("-Xprint-diff", "Print changed parts of the tree since last print.")
   val XprintDiffDel = BooleanSetting("-Xprint-diff-del", "Print chaged parts of the tree since last print including deleted parts.")
-  val prompt = BooleanSetting("-Xprompt", "Display a prompt after each error (debugging option).")
-  val mainClass = StringSetting("-Xmain-class", "path", "Class for manifest's Main-Class entry (only useful with -d <jar>)", "")
+  val Xprompt = BooleanSetting("-Xprompt", "Display a prompt after each error (debugging option).")
+  val XmainClass = StringSetting("-Xmain-class", "path", "Class for manifest's Main-Class entry (only useful with -d <jar>)", "")
   val XnoValueClasses = BooleanSetting("-Xno-value-classes", "Do not use value classes. Helps debugging.")
   val XreplLineWidth = IntSetting("-Xrepl-line-width", "Maximial number of columns per line for REPL output", 390)
   val XfatalWarnings = BooleanSetting("-Xfatal-warnings", "Fail the compilation if there are any warnings.")
   val XverifySignatures = BooleanSetting("-Xverify-signatures", "Verify generic signatures in generated bytecode.")
 
   /** -Y "Private" settings */
-  val overrideVars = BooleanSetting("-Yoverride-vars", "Allow vars to be overridden.")
+  val YoverrideVars = BooleanSetting("-Yoverride-vars", "Allow vars to be overridden.")
   val Yhelp = BooleanSetting("-Y", "Print a synopsis of private options.")
   val Ycheck = PhasesSetting("-Ycheck", "Check the tree at the end of")
   val YcheckMods = BooleanSetting("-Ycheck-mods", "Check that symbols and their defining trees have modifiers in sync")
-  val debug = BooleanSetting("-Ydebug", "Increase the quantity of debugging output.")
-  val debugTrace = BooleanSetting("-Ydebug-trace", "Trace core operations")
-  val debugFlags = BooleanSetting("-Ydebug-flags", "Print all flags of definitions")
-  val debugNames = BooleanSetting("-Ydebug-names", "Show internal representation of names")
-  val debugOwners = BooleanSetting("-Ydebug-owners", "Print all owners of definitions (requires -Yprint-syms)")
-  val termConflict = ChoiceSetting("-Yresolve-term-conflict", "strategy", "Resolve term conflicts", List("package", "object", "error"), "error")
-  val log = PhasesSetting("-Ylog", "Log operations during")
-  val emitTasty = BooleanSetting("-YemitTasty", "Generate tasty in separate *.tasty file.")
+  val Ydebug = BooleanSetting("-Ydebug", "Increase the quantity of debugging output.")
+  val YdebugTrace = BooleanSetting("-Ydebug-trace", "Trace core operations")
+  val YdebugFlags = BooleanSetting("-Ydebug-flags", "Print all flags of definitions")
+  val YdebugNames = BooleanSetting("-Ydebug-names", "Show internal representation of names")
+  val YdebugOwners = BooleanSetting("-Ydebug-owners", "Print all owners of definitions (requires -Yprint-syms)")
+  val YtermConflict = ChoiceSetting("-Yresolve-term-conflict", "strategy", "Resolve term conflicts", List("package", "object", "error"), "error")
+  val Ylog = PhasesSetting("-Ylog", "Log operations during")
+  val YemitTasty = BooleanSetting("-Yemit-tasty", "Generate tasty in separate *.tasty file.")
   val Ylogcp = BooleanSetting("-Ylog-classpath", "Output information about what classpath is being applied.")
   val YdisableFlatCpCaching  = BooleanSetting("-YdisableFlatCpCaching", "Do not cache flat classpath representation of classpath elements from jars across compiler instances.")
 
@@ -95,7 +95,7 @@ class ScalaSettings extends Settings.SettingGroup {
   val YshowSuppressedErrors = BooleanSetting("-Yshow-suppressed-errors", "Also show follow-on errors and warnings that are normally supressed.")
   val YdetailedStats = BooleanSetting("-Ydetailed-stats", "show detailed internal compiler stats (needs Stats.enabled to be set to true).")
   val Yheartbeat = BooleanSetting("-Ydetailed-stats", "show heartbeat stack trace of compiler operations (needs Stats.enabled to be set to true).")
-  val Yprintpos = BooleanSetting("-Yprintpos", "show tree positions.")
+  val YprintPos = BooleanSetting("-Yprint-pos", "show tree positions.")
   val YnoDeepSubtypes = BooleanSetting("-Yno-deep-subtypes", "throw an exception on deep subtyping call stacks.")
   val YnoPatmatOpt = BooleanSetting("-Yno-patmat-opt", "disable all pattern matching optimizations.")
   val YplainPrinter = BooleanSetting("-Yplain-printer", "Pretty-print using a plain printer.")
@@ -111,16 +111,16 @@ class ScalaSettings extends Settings.SettingGroup {
   val YshowTreeIds = BooleanSetting("-Yshow-tree-ids", "Uniquely tag all tree nodes in debugging output.")
 
   /** Area-specific debug output */
-  val Yexplainlowlevel = BooleanSetting("-Yexplain-lowlevel", "When explaining type errors, show types at a lower level.")
+  val YexplainLowlevel = BooleanSetting("-Yexplain-lowlevel", "When explaining type errors, show types at a lower level.")
   val YnoDoubleBindings = BooleanSetting("-Yno-double-bindings", "Assert no namedtype is bound twice (should be enabled only if program is error-free).")
   val YshowVarBounds = BooleanSetting("-Yshow-var-bounds", "Print type variables with their bounds")
   val YnoInline = BooleanSetting("-Yno-inline", "Suppress inlining.")
 
   /** Linker specific flags */
-  val YoptPhases = PhasesSetting("-Yopt-phases", "Restrict the optimisation phases to execute under -optimise.")
-  val YoptFuel = IntSetting("-Yopt-fuel", "Maximum number of optimisations performed under -optimise.", -1)
   val optimise = BooleanSetting("-optimise", "Generates faster bytecode by applying local optimisations to the .program") withAbbreviation "-optimize"
   val Xlink = BooleanSetting("-Xlink", "Recompile library code with the application.")
+  val YoptPhases = PhasesSetting("-Yopt-phases", "Restrict the optimisation phases to execute under -optimise.")
+  val YoptFuel = IntSetting("-Yopt-fuel", "Maximum number of optimisations performed under -optimise.", -1)
 
   /** Dottydoc specific settings */
   val siteRoot = StringSetting(

compiler/src/dotty/tools/dotc/core/Contexts.scala

@@ -368,7 +368,7 @@ object Contexts {
     def erasedTypes: Boolean = phase.erasedTypes
 
     /** Is the debug option set? */
-    def debug: Boolean = base.settings.debug.value
+    def debug: Boolean = base.settings.Ydebug.value
 
     /** Is the verbose option set? */
     def verbose: Boolean = base.settings.verbose.value
@@ -475,7 +475,7 @@ object Contexts {
     def setSetting[T](setting: Setting[T], value: T): this.type =
       setSettings(setting.updateIn(settingsState, value))
 
-    def setDebug = setSetting(base.settings.debug, true)
+    def setDebug = setSetting(base.settings.Ydebug, true)
   }
 
   implicit class ModeChanges(val c: Context) extends AnyVal {

compiler/src/dotty/tools/dotc/core/NameOps.scala

@@ -30,7 +30,7 @@ object NameOps {
      */
     def apply(s: String)(implicit ctx: Context): String = {
       val marker = "$$$$"
-      val limit: Int = ctx.settings.maxClassfileName.value
+      val limit: Int = ctx.settings.XmaxClassfileName.value
       val MaxNameLength = (limit - 6) min 2 * (limit - 6 - 2 * marker.length - 32)
 
       def toMD5(s: String, edge: Int): String = {

compiler/src/dotty/tools/dotc/core/SymDenotations.scala

@@ -1959,7 +1959,7 @@ object SymDenotations {
       val (location, src) =
         if (file != null) (s" in $file", file.toString)
         else ("", "the signature")
-      val name = ctx.fresh.setSetting(ctx.settings.debugNames, true).nameString(denot.name)
+      val name = ctx.fresh.setSetting(ctx.settings.YdebugNames, true).nameString(denot.name)
       def errMsg =
         i"""bad symbolic reference. A signature$location
            |refers to $name in ${denot.owner.showKind} ${denot.owner.showFullName} which is not available.

compiler/src/dotty/tools/dotc/core/SymbolLoaders.scala

@@ -71,11 +71,11 @@ class SymbolLoaders {
       // offer a setting to resolve the conflict one way or the other.
       // This was motivated by the desire to use YourKit probes, which
       // require yjp.jar at runtime. See SI-2089.
-      if (ctx.settings.termConflict.isDefault)
+      if (ctx.settings.YtermConflict.isDefault)
         throw new TypeError(
           i"""$owner contains object and package with same name: $pname
              |one of them needs to be removed from classpath""")
-      else if (ctx.settings.termConflict.value == "package") {
+      else if (ctx.settings.YtermConflict.value == "package") {
         ctx.warning(
           s"Resolving package/object name conflict in favor of package ${preExisting.fullName}. The object will be inaccessible.")
         owner.asClass.delete(preExisting)
@@ -265,7 +265,7 @@ abstract class SymbolLoader extends LazyType {
     }
     try {
       val start = currentTime
-      if (ctx.settings.debugTrace.value)
+      if (ctx.settings.YdebugTrace.value)
         trace(s">>>> loading ${root.debugString}", _ => s"<<<< loaded ${root.debugString}") {
           doComplete(root)
         }

compiler/src/dotty/tools/dotc/core/TypeComparer.scala

@@ -1625,7 +1625,7 @@ class ExplainingTypeComparer(initctx: Context) extends TypeComparer(initctx) {
     }
 
   private def show(res: Any) = res match {
-    case res: printing.Showable if !ctx.settings.Yexplainlowlevel.value => res.show
+    case res: printing.Showable if !ctx.settings.YexplainLowlevel.value => res.show
     case _ => String.valueOf(res)
   }
 

compiler/src/dotty/tools/dotc/printing/PlainPrinter.scala

@@ -326,7 +326,7 @@ class PlainPrinter(_ctx: Context) extends Printer {
         }
         val trueDecls = otherDecls.filterNot(treatAsTypeArg)
         val declsText =
-          if (trueDecls.isEmpty || !ctx.settings.debug.value) Text()
+          if (trueDecls.isEmpty || !ctx.settings.Ydebug.value) Text()
           else dclsText(trueDecls)
         tparamsText ~ " extends " ~ toTextParents(tp.parents) ~ "{" ~ selfText ~ declsText ~
           "} at " ~ preText
@@ -485,12 +485,12 @@ class PlainPrinter(_ctx: Context) extends Printer {
         val elems =
           Text(node.productIterator.map(toTextElem).toList, ", ")
         val tpSuffix =
-          if (ctx.settings.printtypes.value && tree.hasType)
+          if (ctx.settings.XprintTypes.value && tree.hasType)
             " | " ~ toText(tree.typeOpt)
           else
             Text()
 
-        nodeName ~ "(" ~ elems ~ tpSuffix ~ ")" ~ (node.pos.toString provided ctx.settings.Yprintpos.value)
+        nodeName ~ "(" ~ elems ~ tpSuffix ~ ")" ~ (node.pos.toString provided ctx.settings.YprintPos.value)
       case _ =>
         tree.fallbackToText(this)
     }