Skip to content

Commit 0dc0f4c

Browse files
allanrenucciallanrenucci
authored
Merge pull request #3547 from dotty-staging/refactor-scala-settings
Normalize scala settings names
2 parents 8558b4d + 709b95a commit 0dc0f4c

25 files changed

+60
-60
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -402,14 +402,14 @@ class DottyBackendInterface(outputDirectory: AbstractFile, val superCallsMap: Ma
402402
else Some(ctx.settings.Ydumpclasses.value)
403403

404404
def mainClass: Option[String] =
405-
if (ctx.settings.mainClass.isDefault) None
406-
else Some(ctx.settings.mainClass.value)
407-
def setMainClass(name: String): Unit = ctx.settings.mainClass.update(name)
405+
if (ctx.settings.XmainClass.isDefault) None
406+
else Some(ctx.settings.XmainClass.value)
407+
def setMainClass(name: String): Unit = ctx.settings.XmainClass.update(name)
408408

409409

410-
def noForwarders: Boolean = ctx.settings.noForwarders.value
410+
def noForwarders: Boolean = ctx.settings.XnoForwarders.value
411411
def debuglevel: Int = 3 // 0 -> no debug info; 1-> filename; 2-> lines; 3-> varnames
412-
def settings_debug: Boolean = ctx.settings.debug.value
412+
def settings_debug: Boolean = ctx.settings.Ydebug.value
413413
def targetPlatform: String = ctx.settings.target.value
414414

415415
val perRunCaches: Caches = new Caches {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ class GenBCodePipeline(val entryPoints: List[Symbol], val int: DottyBackendInter
225225
for (binary <- ctx.compilationUnit.pickled.get(claszSymbol.asClass)) {
226226
val store = if (mirrorC ne null) mirrorC else plainC
227227
val tasty =
228-
if (ctx.settings.emitTasty.value) {
228+
if (ctx.settings.YemitTasty.value) {
229229
val outTastyFile = getFileForClassfile(outF, store.name, ".tasty")
230230
val outstream = new DataOutputStream(outTastyFile.bufferedOutput)
231231
try outstream.write(binary)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ object Bench extends Driver {
2020
val start = System.nanoTime()
2121
val r = super.doCompile(compiler, fileNames)
2222
println(s"time elapsed: ${(System.nanoTime - start) / 1000000}ms")
23-
if (ctx.settings.prompt.value) {
23+
if (ctx.settings.Xprompt.value) {
2424
print("hit <return> to continue >")
2525
System.in.read()
2626
println()

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

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -51,35 +51,35 @@ class ScalaSettings extends Settings.SettingGroup {
5151
/** -X "Advanced" settings
5252
*/
5353
val Xhelp = BooleanSetting("-X", "Print a synopsis of advanced options.")
54-
val noForwarders = BooleanSetting("-Xno-forwarders", "Do not generate static forwarders in mirror classes.")
54+
val XnoForwarders = BooleanSetting("-Xno-forwarders", "Do not generate static forwarders in mirror classes.")
5555
val XminImplicitSearchDepth = IntSetting("-Xmin-implicit-search-depth", "Set number of levels of implicit searches undertaken before checking for divergence.", 5)
5656
val xmaxInlines = IntSetting("-Xmax-inlines", "Maximal number of successive inlines", 32)
57-
val maxClassfileName = IntSetting("-Xmax-classfile-name", "Maximum filename length for generated classes", 255, 72 to 255)
57+
val XmaxClassfileName = IntSetting("-Xmax-classfile-name", "Maximum filename length for generated classes", 255, 72 to 255)
5858
val Xmigration = VersionSetting("-Xmigration", "Warn about constructs whose behavior may have changed since version.")
5959
val Xprint = PhasesSetting("-Xprint", "Print out program after")
60-
val printtypes = BooleanSetting("-Xprint-types", "Print tree types (debugging option).")
60+
val XprintTypes = BooleanSetting("-Xprint-types", "Print tree types (debugging option).")
6161
val XprintDiff = BooleanSetting("-Xprint-diff", "Print changed parts of the tree since last print.")
6262
val XprintDiffDel = BooleanSetting("-Xprint-diff-del", "Print chaged parts of the tree since last print including deleted parts.")
63-
val prompt = BooleanSetting("-Xprompt", "Display a prompt after each error (debugging option).")
64-
val mainClass = StringSetting("-Xmain-class", "path", "Class for manifest's Main-Class entry (only useful with -d <jar>)", "")
63+
val Xprompt = BooleanSetting("-Xprompt", "Display a prompt after each error (debugging option).")
64+
val XmainClass = StringSetting("-Xmain-class", "path", "Class for manifest's Main-Class entry (only useful with -d <jar>)", "")
6565
val XnoValueClasses = BooleanSetting("-Xno-value-classes", "Do not use value classes. Helps debugging.")
6666
val XreplLineWidth = IntSetting("-Xrepl-line-width", "Maximial number of columns per line for REPL output", 390)
6767
val XfatalWarnings = BooleanSetting("-Xfatal-warnings", "Fail the compilation if there are any warnings.")
6868
val XverifySignatures = BooleanSetting("-Xverify-signatures", "Verify generic signatures in generated bytecode.")
6969

7070
/** -Y "Private" settings */
71-
val overrideVars = BooleanSetting("-Yoverride-vars", "Allow vars to be overridden.")
71+
val YoverrideVars = BooleanSetting("-Yoverride-vars", "Allow vars to be overridden.")
7272
val Yhelp = BooleanSetting("-Y", "Print a synopsis of private options.")
7373
val Ycheck = PhasesSetting("-Ycheck", "Check the tree at the end of")
7474
val YcheckMods = BooleanSetting("-Ycheck-mods", "Check that symbols and their defining trees have modifiers in sync")
75-
val debug = BooleanSetting("-Ydebug", "Increase the quantity of debugging output.")
76-
val debugTrace = BooleanSetting("-Ydebug-trace", "Trace core operations")
77-
val debugFlags = BooleanSetting("-Ydebug-flags", "Print all flags of definitions")
78-
val debugNames = BooleanSetting("-Ydebug-names", "Show internal representation of names")
79-
val debugOwners = BooleanSetting("-Ydebug-owners", "Print all owners of definitions (requires -Yprint-syms)")
80-
val termConflict = ChoiceSetting("-Yresolve-term-conflict", "strategy", "Resolve term conflicts", List("package", "object", "error"), "error")
81-
val log = PhasesSetting("-Ylog", "Log operations during")
82-
val emitTasty = BooleanSetting("-YemitTasty", "Generate tasty in separate *.tasty file.")
75+
val Ydebug = BooleanSetting("-Ydebug", "Increase the quantity of debugging output.")
76+
val YdebugTrace = BooleanSetting("-Ydebug-trace", "Trace core operations")
77+
val YdebugFlags = BooleanSetting("-Ydebug-flags", "Print all flags of definitions")
78+
val YdebugNames = BooleanSetting("-Ydebug-names", "Show internal representation of names")
79+
val YdebugOwners = BooleanSetting("-Ydebug-owners", "Print all owners of definitions (requires -Yprint-syms)")
80+
val YtermConflict = ChoiceSetting("-Yresolve-term-conflict", "strategy", "Resolve term conflicts", List("package", "object", "error"), "error")
81+
val Ylog = PhasesSetting("-Ylog", "Log operations during")
82+
val YemitTasty = BooleanSetting("-Yemit-tasty", "Generate tasty in separate *.tasty file.")
8383
val Ylogcp = BooleanSetting("-Ylog-classpath", "Output information about what classpath is being applied.")
8484
val YdisableFlatCpCaching = BooleanSetting("-YdisableFlatCpCaching", "Do not cache flat classpath representation of classpath elements from jars across compiler instances.")
8585

@@ -95,7 +95,7 @@ class ScalaSettings extends Settings.SettingGroup {
9595
val YshowSuppressedErrors = BooleanSetting("-Yshow-suppressed-errors", "Also show follow-on errors and warnings that are normally supressed.")
9696
val YdetailedStats = BooleanSetting("-Ydetailed-stats", "show detailed internal compiler stats (needs Stats.enabled to be set to true).")
9797
val Yheartbeat = BooleanSetting("-Ydetailed-stats", "show heartbeat stack trace of compiler operations (needs Stats.enabled to be set to true).")
98-
val Yprintpos = BooleanSetting("-Yprintpos", "show tree positions.")
98+
val YprintPos = BooleanSetting("-Yprint-pos", "show tree positions.")
9999
val YnoDeepSubtypes = BooleanSetting("-Yno-deep-subtypes", "throw an exception on deep subtyping call stacks.")
100100
val YnoPatmatOpt = BooleanSetting("-Yno-patmat-opt", "disable all pattern matching optimizations.")
101101
val YplainPrinter = BooleanSetting("-Yplain-printer", "Pretty-print using a plain printer.")
@@ -111,16 +111,16 @@ class ScalaSettings extends Settings.SettingGroup {
111111
val YshowTreeIds = BooleanSetting("-Yshow-tree-ids", "Uniquely tag all tree nodes in debugging output.")
112112

113113
/** Area-specific debug output */
114-
val Yexplainlowlevel = BooleanSetting("-Yexplain-lowlevel", "When explaining type errors, show types at a lower level.")
114+
val YexplainLowlevel = BooleanSetting("-Yexplain-lowlevel", "When explaining type errors, show types at a lower level.")
115115
val YnoDoubleBindings = BooleanSetting("-Yno-double-bindings", "Assert no namedtype is bound twice (should be enabled only if program is error-free).")
116116
val YshowVarBounds = BooleanSetting("-Yshow-var-bounds", "Print type variables with their bounds")
117117
val YnoInline = BooleanSetting("-Yno-inline", "Suppress inlining.")
118118

119119
/** Linker specific flags */
120-
val YoptPhases = PhasesSetting("-Yopt-phases", "Restrict the optimisation phases to execute under -optimise.")
121-
val YoptFuel = IntSetting("-Yopt-fuel", "Maximum number of optimisations performed under -optimise.", -1)
122120
val optimise = BooleanSetting("-optimise", "Generates faster bytecode by applying local optimisations to the .program") withAbbreviation "-optimize"
123121
val Xlink = BooleanSetting("-Xlink", "Recompile library code with the application.")
122+
val YoptPhases = PhasesSetting("-Yopt-phases", "Restrict the optimisation phases to execute under -optimise.")
123+
val YoptFuel = IntSetting("-Yopt-fuel", "Maximum number of optimisations performed under -optimise.", -1)
124124

125125
/** Dottydoc specific settings */
126126
val siteRoot = StringSetting(

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ object Contexts {
368368
def erasedTypes: Boolean = phase.erasedTypes
369369

370370
/** Is the debug option set? */
371-
def debug: Boolean = base.settings.debug.value
371+
def debug: Boolean = base.settings.Ydebug.value
372372

373373
/** Is the verbose option set? */
374374
def verbose: Boolean = base.settings.verbose.value
@@ -475,7 +475,7 @@ object Contexts {
475475
def setSetting[T](setting: Setting[T], value: T): this.type =
476476
setSettings(setting.updateIn(settingsState, value))
477477

478-
def setDebug = setSetting(base.settings.debug, true)
478+
def setDebug = setSetting(base.settings.Ydebug, true)
479479
}
480480

481481
implicit class ModeChanges(val c: Context) extends AnyVal {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ object NameOps {
3030
*/
3131
def apply(s: String)(implicit ctx: Context): String = {
3232
val marker = "$$$$"
33-
val limit: Int = ctx.settings.maxClassfileName.value
33+
val limit: Int = ctx.settings.XmaxClassfileName.value
3434
val MaxNameLength = (limit - 6) min 2 * (limit - 6 - 2 * marker.length - 32)
3535

3636
def toMD5(s: String, edge: Int): String = {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1959,7 +1959,7 @@ object SymDenotations {
19591959
val (location, src) =
19601960
if (file != null) (s" in $file", file.toString)
19611961
else ("", "the signature")
1962-
val name = ctx.fresh.setSetting(ctx.settings.debugNames, true).nameString(denot.name)
1962+
val name = ctx.fresh.setSetting(ctx.settings.YdebugNames, true).nameString(denot.name)
19631963
def errMsg =
19641964
i"""bad symbolic reference. A signature$location
19651965
|refers to $name in ${denot.owner.showKind} ${denot.owner.showFullName} which is not available.

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,11 @@ class SymbolLoaders {
7171
// offer a setting to resolve the conflict one way or the other.
7272
// This was motivated by the desire to use YourKit probes, which
7373
// require yjp.jar at runtime. See SI-2089.
74-
if (ctx.settings.termConflict.isDefault)
74+
if (ctx.settings.YtermConflict.isDefault)
7575
throw new TypeError(
7676
i"""$owner contains object and package with same name: $pname
7777
|one of them needs to be removed from classpath""")
78-
else if (ctx.settings.termConflict.value == "package") {
78+
else if (ctx.settings.YtermConflict.value == "package") {
7979
ctx.warning(
8080
s"Resolving package/object name conflict in favor of package ${preExisting.fullName}. The object will be inaccessible.")
8181
owner.asClass.delete(preExisting)
@@ -265,7 +265,7 @@ abstract class SymbolLoader extends LazyType {
265265
}
266266
try {
267267
val start = currentTime
268-
if (ctx.settings.debugTrace.value)
268+
if (ctx.settings.YdebugTrace.value)
269269
trace(s">>>> loading ${root.debugString}", _ => s"<<<< loaded ${root.debugString}") {
270270
doComplete(root)
271271
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1625,7 +1625,7 @@ class ExplainingTypeComparer(initctx: Context) extends TypeComparer(initctx) {
16251625
}
16261626

16271627
private def show(res: Any) = res match {
1628-
case res: printing.Showable if !ctx.settings.Yexplainlowlevel.value => res.show
1628+
case res: printing.Showable if !ctx.settings.YexplainLowlevel.value => res.show
16291629
case _ => String.valueOf(res)
16301630
}
16311631

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ class PlainPrinter(_ctx: Context) extends Printer {
326326
}
327327
val trueDecls = otherDecls.filterNot(treatAsTypeArg)
328328
val declsText =
329-
if (trueDecls.isEmpty || !ctx.settings.debug.value) Text()
329+
if (trueDecls.isEmpty || !ctx.settings.Ydebug.value) Text()
330330
else dclsText(trueDecls)
331331
tparamsText ~ " extends " ~ toTextParents(tp.parents) ~ "{" ~ selfText ~ declsText ~
332332
"} at " ~ preText
@@ -485,12 +485,12 @@ class PlainPrinter(_ctx: Context) extends Printer {
485485
val elems =
486486
Text(node.productIterator.map(toTextElem).toList, ", ")
487487
val tpSuffix =
488-
if (ctx.settings.printtypes.value && tree.hasType)
488+
if (ctx.settings.XprintTypes.value && tree.hasType)
489489
" | " ~ toText(tree.typeOpt)
490490
else
491491
Text()
492492

493-
nodeName ~ "(" ~ elems ~ tpSuffix ~ ")" ~ (node.pos.toString provided ctx.settings.Yprintpos.value)
493+
nodeName ~ "(" ~ elems ~ tpSuffix ~ ")" ~ (node.pos.toString provided ctx.settings.YprintPos.value)
494494
case _ =>
495495
tree.fallbackToText(this)
496496
}

‎compiler/src/dotty/tools/dotc/printing/RefinedPrinter.scala

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class RefinedPrinter(_ctx: Context) extends PlainPrinter(_ctx) {
2424
/** A stack of enclosing DefDef, TypeDef, or ClassDef, or ModuleDefs nodes */
2525
private[this] var enclosingDef: untpd.Tree = untpd.EmptyTree
2626
private[this] var myCtx: Context = _ctx
27-
private[this] var printPos = ctx.settings.Yprintpos.value
27+
private[this] var printPos = ctx.settings.YprintPos.value
2828
private[this] val printLines = ctx.settings.printLines.value
2929
override protected[this] implicit def ctx: Context = myCtx
3030

@@ -63,7 +63,7 @@ class RefinedPrinter(_ctx: Context) extends PlainPrinter(_ctx) {
6363
protected val PrintableFlags = (SourceModifierFlags | Label | Module | Local).toCommonFlags
6464

6565
override def nameString(name: Name): String =
66-
if (ctx.settings.debugNames.value) name.debugString else name.toString
66+
if (ctx.settings.YdebugNames.value) name.debugString else name.toString
6767

6868
override protected def simpleNameString(sym: Symbol): String =
6969
nameString(if (ctx.property(XprintMode).isEmpty) sym.originalName else sym.name)
@@ -257,7 +257,7 @@ class RefinedPrinter(_ctx: Context) extends PlainPrinter(_ctx) {
257257
def modText(mods: untpd.Modifiers, kw: String): Text = { // DD
258258
val suppressKw = if (enclDefIsClass) mods is ParamAndLocal else mods is Param
259259
var flagMask =
260-
if (ctx.settings.debugFlags.value) AnyFlags
260+
if (ctx.settings.YdebugFlags.value) AnyFlags
261261
else if (suppressKw) PrintableFlags &~ Private
262262
else PrintableFlags
263263
if (homogenizedView && mods.flags.isTypeFlags) flagMask &~= Implicit // drop implicit from classes
@@ -283,7 +283,7 @@ class RefinedPrinter(_ctx: Context) extends PlainPrinter(_ctx) {
283283
def dclTextOr(treeText: => Text) =
284284
if (useSymbol)
285285
annotsText(tree.symbol) ~~ dclText(tree.symbol) ~
286-
( " <in " ~ toText(tree.symbol.owner) ~ ">" provided ctx.settings.debugOwners.value)
286+
( " <in " ~ toText(tree.symbol.owner) ~ ">" provided ctx.settings.YdebugOwners.value)
287287
else treeText
288288

289289
def idText(tree: untpd.Tree): Text = {
@@ -608,8 +608,8 @@ class RefinedPrinter(_ctx: Context) extends PlainPrinter(_ctx) {
608608
case _ => false
609609
}
610610

611-
if (ctx.settings.printtypes.value && tree.hasType) {
612-
// add type to term nodes; replace type nodes with their types unless -Yprintpos is also set.
611+
if (ctx.settings.XprintTypes.value && tree.hasType) {
612+
// add type to term nodes; replace type nodes with their types unless -Yprint-pos is also set.
613613
def tp = tree.typeOpt match {
614614
case tp: TermRef if tree.isInstanceOf[RefTree] && !tp.denot.isOverloaded => tp.underlying
615615
case tp => tp
@@ -688,7 +688,7 @@ class RefinedPrinter(_ctx: Context) extends PlainPrinter(_ctx) {
688688
}
689689

690690
override def toTextFlags(sym: Symbol) =
691-
if (ctx.settings.debugFlags.value)
691+
if (ctx.settings.YdebugFlags.value)
692692
super.toTextFlags(sym)
693693
else {
694694
var flags = sym.flagsUNSAFE

‎compiler/src/dotty/tools/dotc/reporting/ConsoleReporter.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class ConsoleReporter(
2525
val didPrint = m match {
2626
case m: Error =>
2727
printMessage(messageAndPos(m.contained(), m.pos, diagnosticLevel(m)))
28-
if (ctx.settings.prompt.value) displayPrompt()
28+
if (ctx.settings.Xprompt.value) displayPrompt()
2929
true
3030
case m: ConditionalWarning if !m.enablingOption.value =>
3131
false

‎compiler/src/dotty/tools/dotc/reporting/Reporter.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ trait Reporting { this: Context =>
103103
* "contains" here.
104104
*/
105105
def log(msg: => String, pos: SourcePosition = NoSourcePosition): Unit =
106-
if (this.settings.log.value.containsPhase(phase))
106+
if (this.settings.Ylog.value.containsPhase(phase))
107107
echo(s"[log ${ctx.phasesStack.reverse.mkString(" -> ")}] $msg", pos)
108108

109109
def debuglog(msg: => String): Unit =
@@ -123,7 +123,7 @@ trait Reporting { this: Context =>
123123
}
124124

125125
def debugwarn(msg: => String, pos: SourcePosition = NoSourcePosition): Unit =
126-
if (this.settings.debug.value) warning(msg, pos)
126+
if (this.settings.Ydebug.value) warning(msg, pos)
127127
}
128128

129129
/**

‎compiler/src/dotty/tools/dotc/reporting/trace.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ object trace {
1111

1212
@inline
1313
def onDebug[TD](question: => String)(op: => TD)(implicit ctx: Context): TD =
14-
conditionally(ctx.settings.debugTrace.value, question, false)(op)
14+
conditionally(ctx.settings.YdebugTrace.value, question, false)(op)
1515

1616
@inline
1717
def conditionally[TC](cond: Boolean, question: => String, show: Boolean)(op: => TC)(implicit ctx: Context): TC =

‎compiler/src/dotty/tools/dotc/sbt/ExtractAPI.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -565,7 +565,7 @@ private class ExtractAPICollector(implicit val ctx: Context) extends ThunkHolder
565565
// typed tree of the method as part of the signature we send to sbt.
566566
// To do this properly we would need a way to hash trees and types in
567567
// dotty itself.
568-
val printTypesCtx = ctx.fresh.setSetting(ctx.settings.printtypes, true)
568+
val printTypesCtx = ctx.fresh.setSetting(ctx.settings.XprintTypes, true)
569569
annots += marker(Inliner.bodyToInline(s).show(printTypesCtx).toString)
570570
}
571571

‎compiler/src/dotty/tools/dotc/transform/ResolveSuper.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ object ResolveSuper {
107107
ctx.debuglog(i"starting rebindsuper from $base of ${acc.showLocated}: ${acc.info} in $bcs, name = $memberName")
108108
while (bcs.nonEmpty && sym == NoSymbol) {
109109
val other = bcs.head.info.nonPrivateDecl(memberName)
110-
if (ctx.settings.debug.value)
110+
if (ctx.settings.Ydebug.value)
111111
ctx.log(i"rebindsuper ${bcs.head} $other deferred = ${other.symbol.is(Deferred)}")
112112
sym = other.matchingDenotation(base.thisType, base.thisType.memberInfo(acc)).symbol
113113
bcs = bcs.tail

‎compiler/src/dotty/tools/dotc/typer/RefChecks.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ object RefChecks {
218218
";\n (Note that %s is abstract,\n and is therefore overridden by concrete %s)".format(
219219
infoStringWithLocation(other),
220220
infoStringWithLocation(member))
221-
else if (ctx.settings.debug.value)
221+
else if (ctx.settings.Ydebug.value)
222222
err.typeMismatchMsg(memberTp(self), otherTp(self))
223223
else ""
224224

@@ -355,7 +355,7 @@ object RefChecks {
355355
other.accessedFieldOrGetter.is(Mutable, butNot = Lazy)) {
356356
// !?! this is not covered by the spec. We need to resolve this either by changing the spec or removing the test here.
357357
// !!! is there a !?! convention? I'm !!!ing this to make sure it turns up on my searches.
358-
if (!ctx.settings.overrideVars.value)
358+
if (!ctx.settings.YoverrideVars.value)
359359
overrideError("cannot override a mutable variable")
360360
} else if (member.isAnyOverride &&
361361
!(member.owner.thisType.baseClasses exists (_ isSubClass other.owner)) &&

‎compiler/test/dotc/tests.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ class tests extends CompilerTest {
7373
else List("-Ycheck:tailrec,resolveSuper,mixin,elimStaticThis,labelDef,simplify")
7474
} ++ checkOptions ++ classPath
7575

76-
val testPickling = List("-Xprint-types", "-Ytest-pickler", "-Ystop-after:pickler", "-Yprintpos")
76+
val testPickling = List("-Xprint-types", "-Ytest-pickler", "-Ystop-after:pickler", "-Yprint-pos")
7777

7878
val twice = List("#runs", "2")
7979
val staleSymbolError: List[String] = List()

0 commit comments

Comments
 (0)