Skip to content

Commit 22d6ee5

Browse files
committed
Add some missing calls to flagString
1 parent c88ca78 commit 22d6ee5

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

compiler/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -464,9 +464,9 @@ class Scala2Unpickler(bytes: Array[Byte], classRoot: ClassDenotation, moduleClas
464464
def isModuleClassRoot = nameMatches(moduleClassRoot.name) && (owner == moduleClassRoot.owner) && flags.is(Module)
465465
def isModuleRoot = nameMatches(moduleClassRoot.name.sourceModuleName) && (owner == moduleClassRoot.owner) && flags.is(Module)
466466

467-
//if (isClassRoot) println(s"classRoot of $classRoot found at $readIndex, flags = $flags") // !!! DEBUG
468-
//if (isModuleRoot) println(s"moduleRoot of $moduleRoot found at $readIndex, flags = $flags") // !!! DEBUG
469-
//if (isModuleClassRoot) println(s"moduleClassRoot of $moduleClassRoot found at $readIndex, flags = $flags") // !!! DEBUG
467+
//if (isClassRoot) println(s"classRoot of $classRoot found at $readIndex, flags = ${flags.flagsString}") // !!! DEBUG
468+
//if (isModuleRoot) println(s"moduleRoot of $moduleRoot found at $readIndex, flags = ${flags.flagsString}") // !!! DEBUG
469+
//if (isModuleClassRoot) println(s"moduleClassRoot of $moduleClassRoot found at $readIndex, flags = ${flags.flagsString}") // !!! DEBUG
470470

471471
def completeRoot(denot: ClassDenotation, completer: LazyType): Symbol = {
472472
denot.setFlag(flags)

compiler/src/dotty/tools/dotc/reporting/diagnostic/messages.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1504,7 +1504,7 @@ object messages {
15041504
case class AbstractMemberMayNotHaveModifier(sym: Symbol, flag: FlagSet)(
15051505
implicit ctx: Context)
15061506
extends Message(AbstractMemberMayNotHaveModifierID) {
1507-
val msg: String = em"""${hl("abstract")} $sym may not have `$flag' modifier"""
1507+
val msg: String = em"""${hl("abstract")} $sym may not have `${flag.flagsString}' modifier"""
15081508
val kind: String = "Syntax"
15091509
val explanation: String = ""
15101510
}

compiler/src/dotty/tools/dotc/typer/Checking.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -394,10 +394,10 @@ object Checking {
394394
def checkNoConflict(flag1: FlagSet, flag2: FlagSet, msg: => String) =
395395
if (sym.isAllOf(flag1 | flag2)) fail(msg)
396396
def checkCombination(flag1: FlagSet, flag2: FlagSet) =
397-
checkNoConflict(flag1, flag2, i"illegal combination of modifiers: `$flag1` and `$flag2` for: $sym")
397+
checkNoConflict(flag1, flag2, i"illegal combination of modifiers: `${flag1.flagsString}` and `${flag2.flagsString}` for: $sym")
398398
def checkApplicable(flag: FlagSet, ok: Boolean) =
399399
if (!ok && !sym.is(Synthetic))
400-
fail(i"modifier `$flag` is not allowed for this definition")
400+
fail(i"modifier `${flag.flagsString}` is not allowed for this definition")
401401

402402
if (sym.is(Inline) &&
403403
( sym.is(ParamAccessor) && sym.owner.isClass

0 commit comments

Comments
 (0)