address feedback: ctx.settings

Author: magarciaEPFL

src/dotty/tools/dotc/backend/jvm/BCodeHelpers.scala

@@ -388,7 +388,7 @@ abstract class BCodeHelpers extends BCodeTypes with BytecodeWriters {
 
   trait BCInnerClassGen extends HasContext {
 
-    def debugLevel = ctx.base.settings.g.indexOfChoice
+    def debugLevel = ctx.settings.g.indexOfChoice
 
     val emitSource = debugLevel >= 1
     val emitLines  = debugLevel >= 2
@@ -790,7 +790,7 @@ abstract class BCodeHelpers extends BCodeTypes with BytecodeWriters {
       // without it.  This is particularly bad because the availability of
       // generic information could disappear as a consequence of a seemingly
       // unrelated change.
-         ctx.base.settings.Ynogenericsig
+         ctx.settings.Ynogenericsig
       || sym.isArtifact
       || sym.isLiftedMethod
       || sym.isBridge
@@ -822,7 +822,7 @@ abstract class BCodeHelpers extends BCodeTypes with BytecodeWriters {
             catch { case _: Throwable => false }
           }
 
-      if (ctx.base.settings.Xverify) {
+      if (ctx.settings.Xverify) {
         // Run the signature parser to catch bogus signatures.
         val isValidSignature = wrap {
           // Alternative: scala.tools.reflect.SigParser (frontend to sun.reflect.generics.parser.SignatureParser)
@@ -842,7 +842,7 @@ abstract class BCodeHelpers extends BCodeTypes with BytecodeWriters {
         }
       }
 
-      if ((ctx.base.settings.check containsName phaseName)) {
+      if ((ctx.settings.check containsName phaseName)) {
         val normalizedTpe = enteringErasure(erasure.prepareSigMap(memberTpe))
         val bytecodeTpe = owner.thisType.memberInfo(sym)
         if (!sym.isType && !sym.isConstructor && !(erasure.erasure(sym)(normalizedTpe) =:= bytecodeTpe)) {

src/dotty/tools/dotc/backend/jvm/BCodeIdiomatic.scala

@@ -25,7 +25,7 @@ import core.Symbols.{Symbol, NoSymbol}
  */
 abstract class BCodeIdiomatic extends BCodeGlue {
 
-  def classfileVersion(implicit ctx: Context): Int = ctx.base.settings.target.value match {
+  def classfileVersion(implicit ctx: Context): Int = ctx.settings.target.value match {
     case "jvm-1.5"     => asm.Opcodes.V1_5
     case "jvm-1.6"     => asm.Opcodes.V1_6
     case "jvm-1.7"     => asm.Opcodes.V1_7

src/dotty/tools/dotc/backend/jvm/BCodeSkelBuilder.scala

@@ -171,7 +171,7 @@ abstract class BCodeSkelBuilder extends BCodeHelpers {
 
       } else {
 
-        val skipStaticForwarders = (claszSymbol.isInterface || ctx.base.settings.noForwarders)
+        val skipStaticForwarders = (claszSymbol.isInterface || ctx.settings.noForwarders)
         if (!skipStaticForwarders) {
           val lmoc = claszSymbol.companionModule
           // add static forwarders if there are no name conflicts; see bugs #363 and #1735
@@ -605,7 +605,7 @@ abstract class BCodeSkelBuilder extends BCodeHelpers {
             case Return(_) => ()
             case EmptyTree =>
               globalError("Concrete method has no definition: " + dd + (
-                if (ctx.base.settings.debug) "(found: " + methSymbol.owner.info.decls.toList.mkString(", ") + ")"
+                if (ctx.settings.debug) "(found: " + methSymbol.owner.info.decls.toList.mkString(", ") + ")"
                 else "")
               )
             case _ =>

src/dotty/tools/dotc/backend/jvm/BCodeTypes.scala

@@ -29,7 +29,7 @@ import StdNames.{nme, tpnme}
 abstract class BCodeTypes extends BCodeIdiomatic {
 
   // when compiling the Scala library, some assertions don't hold (e.g., scala.Boolean has null superClass although it's not an interface)
-  def isCompilingStdLib(implicit ctx: Context) = !(ctx.base.settings.sourcepath.isDefault)
+  def isCompilingStdLib(implicit ctx: Context) = !(ctx.settings.sourcepath.isDefault)
 
   val srBoxedUnit  = brefType("scala/runtime/BoxedUnit")
 

src/dotty/tools/dotc/backend/jvm/BytecodeWriters.scala

@@ -24,7 +24,7 @@ class FileConflictException(msg: String, val file: AbstractFile) extends IOExcep
 trait BytecodeWriters {
 
   def outputDirectory(sym: Symbol)(implicit ctx: Context): AbstractFile =
-    ctx.base.settings.outputDirs outputDirFor enteringFlatten(sym.sourceFile)
+    ctx.settings.outputDirs outputDirFor enteringFlatten(sym.sourceFile)
 
   /**
    * @param clsName cls.getName
@@ -61,8 +61,8 @@ trait BytecodeWriters {
   extends BytecodeWriter
   with HasContext {
     val jarMainAttrs = (
-      if (ctx.base.settings.mainClass.isDefault) Nil
-      else List(Name.MAIN_CLASS -> ctx.base.settings.mainClass.value)
+      if (ctx.settings.mainClass.isDefault) Nil
+      else List(Name.MAIN_CLASS -> ctx.settings.mainClass.value)
     )
     val writer = new Jar(jfile).jarWriter(jarMainAttrs: _*)
 
@@ -91,7 +91,7 @@ trait BytecodeWriters {
   trait AsmpBytecodeWriter extends BytecodeWriter with HasContext {
     import dotty.tools.asm
 
-    private val baseDir = Directory(ctx.base.settings.Ygenasmp.value).createDirectory()
+    private val baseDir = Directory(ctx.settings.Ygenasmp.value).createDirectory()
 
     private def emitAsmp(jclassBytes: Array[Byte], asmpFile: io.File): Unit = {
       val pw = asmpFile.printWriter()
@@ -130,7 +130,7 @@ trait BytecodeWriters {
   }
 
   trait DumpBytecodeWriter extends BytecodeWriter with HasContext {
-    val baseDir = Directory(ctx.base.settings.Ydumpclasses.value).createDirectory()
+    val baseDir = Directory(ctx.settings.Ydumpclasses.value).createDirectory()
 
     abstract override def writeClass(label: String, jclassName: String, jclassBytes: Array[Byte], outfile: AbstractFile): Unit = {
       super.writeClass(label, jclassName, jclassBytes, outfile)