Skip to content

Commit 3e62583

Browse files
oderskyodersky
committed
Flag renamings
Where it makes sense, flag combinations have been renamed to follow their alphabetically ordered definitions.
1 parent af6ee9d commit 3e62583

File tree

15 files changed

+35
-40
lines changed

15 files changed

+35
-40
lines changed

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ class DottyBackendInterface(outputDirectory: AbstractFile, val superCallsMap: Ma
256256
case t: TypeApply if (t.fun.symbol == Predef_classOf) =>
257257
av.visit(name, t.args.head.tpe.classSymbol.denot.info.toTypeKind(bcodeStore)(innerClasesStore).toASMType)
258258
case t: tpd.RefTree =>
259-
if (t.symbol.denot.owner.isAllOf(Flags.JavaEnum)) {
259+
if (t.symbol.denot.owner.isAllOf(Flags.JavaEnumTrait)) {
260260
val edesc = innerClasesStore.typeDescriptor(t.tpe.asInstanceOf[bcodeStore.int.Type]) // the class descriptor of the enumeration class.
261261
val evalue = t.symbol.name.mangledString // value the actual enumeration value.
262262
av.visitEnum(name, edesc, evalue)
@@ -689,13 +689,12 @@ class DottyBackendInterface(outputDirectory: AbstractFile, val superCallsMap: Ma
689689
def isBottomClass: Boolean = (sym ne defn.NullClass) && (sym ne defn.NothingClass)
690690
def isBridge: Boolean = sym.is(Flags.Bridge)
691691
def isArtifact: Boolean = sym.is(Flags.Artifact)
692-
def hasEnumFlag: Boolean = sym.isAllOf(Flags.JavaEnum)
692+
def hasEnumFlag: Boolean = sym.isAllOf(Flags.JavaEnumTrait)
693693
def hasAccessBoundary: Boolean = sym.accessBoundary(defn.RootClass) ne defn.RootClass
694694
def isVarargsMethod: Boolean = sym.is(Flags.JavaVarargs)
695695
def isDeprecated: Boolean = false
696696
def isMutable: Boolean = sym.is(Flags.Mutable)
697-
def hasAbstractFlag: Boolean =
698-
(sym.is(Flags.Abstract)) || (sym.isAllOf(Flags.JavaInterface)) || (sym.is(Flags.Trait))
697+
def hasAbstractFlag: Boolean = sym.isOneOf(Flags.AbstractOrTrait)
699698
def hasModuleFlag: Boolean = sym.is(Flags.Module)
700699
def isSynchronized: Boolean = sym.is(Flags.Synchronized)
701700
def isNonBottomSubClass(other: Symbol): Boolean = sym.derivesFrom(other)

‎compiler/src/dotty/tools/dotc/ast/Desugar.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ object desugar {
182182

183183
def makeImplicitParameters(tpts: List[Tree], implicitFlag: FlagSet, forPrimaryConstructor: Boolean = false)(implicit ctx: Context): List[ValDef] =
184184
for (tpt <- tpts) yield {
185-
val paramFlags: FlagSet = if (forPrimaryConstructor) PrivateLocalParamAccessor else Param
185+
val paramFlags: FlagSet = if (forPrimaryConstructor) LocalParamAccessor else Param
186186
val epname = EvidenceParamName.fresh()
187187
ValDef(epname, tpt, EmptyTree).withFlags(paramFlags | implicitFlag)
188188
}

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

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -520,18 +520,18 @@ object Flags {
520520
// ------- Other flag sets -------------------------------------
521521

522522
val AbstractFinal: FlagSet = Abstract | Final
523-
val AbstractSealed: FlagSet = Abstract | Sealed
524523
val AbstractOverride: FlagSet = Abstract | Override
524+
val AbstractSealed: FlagSet = Abstract | Sealed
525525
val AbstractOrTrait: FlagSet = Abstract | Trait
526526
val PrivateAccessor: FlagSet = Accessor | Private
527527
val AccessorOrSynthetic: FlagSet = Accessor | Synthetic
528528
val EnumCase: FlagSet = Case | Enum
529-
val LocalCovariant: FlagSet = Covariant | Local // A covariant type parameter
530-
val LocalContravariant: FlagSet = Contravariant | Local // A contravariant type parameter
529+
val CovariantLocal: FlagSet = Covariant | Local // A covariant type parameter
530+
val ContravariantLocal: FlagSet = Contravariant | Local // A contravariant type parameter
531531
val HasDefaultParamsFlags: FlagSet = DefaultParameterized | InheritedDefaultParams // Has defined or inherited default parameters
532532
val DefaultParameter: FlagSet = DefaultParameterized | Param // A Scala 2x default parameter
533-
val LazyOrDeferred: FlagSet = Deferred | Lazy
534-
val MethodOrLazyOrDeferred: FlagSet = Deferred | Lazy | Method
533+
val DeferredOrLazy: FlagSet = Deferred | Lazy
534+
val DeferredOrLazyOrMethod: FlagSet = Deferred | Lazy | Method
535535
val DeferredOrTermParamOrAccessor: FlagSet = Deferred | ParamAccessor | TermParam // term symbols without right-hand sides
536536
val DeferredOrTypeParam: FlagSet = Deferred | TypeParam // type symbols without right-hand sides
537537
val DelegateOrGiven: FlagSet = Delegate | Given
@@ -542,29 +542,25 @@ object Flags {
542542
val StableOrErased: FlagSet = Erased | StableRealizable // Assumed to be pure
543543
val ExtensionMethod: FlagSet = Extension | Method
544544
val FinalOrInline: FlagSet = Final | Inline
545-
val FinalOrSealed: FlagSet = Final | Sealed
546-
val ModuleOrFinal: FlagSet = Final | ModuleClass // A module class or a final class
545+
val FinalOrModuleClass: FlagSet = Final | ModuleClass // A module class or a final class
547546
val EffectivelyFinalFlags: FlagSet = Final | Private
547+
val FinalOrSealed: FlagSet = Final | Sealed
548548
val GivenOrImplicit: FlagSet = Given | Implicit
549549
val InlineOrProxy: FlagSet = Inline | InlineProxy // An inline method or inline argument proxy */
550550
val InlineMethod: FlagSet = Inline | Method
551551
val InlineParam: FlagSet = Inline | Param
552552
val InlineByNameProxy: FlagSet = InlineProxy | Method
553-
val JavaEnum: FlagSet = JavaDefined | Enum // TODO: merge with JavaEnumTrait
554553
val JavaEnumTrait: FlagSet = JavaDefined | Enum // A Java enum trait
555554
val JavaEnumValue: FlagSet = JavaDefined | EnumValue // A Java enum value
556555
val StaticProtected: FlagSet = JavaDefined | JavaStatic | Protected // Java symbol which is `protected` and `static`
557556
val JavaModule: FlagSet = JavaDefined | Module // A Java companion object
558-
val JavaTrait: FlagSet = JavaDefined | NoInits | Trait // A Java interface, potentially with default methods // TODO: merge with JavaInterface
557+
val JavaInterface: FlagSet = JavaDefined | NoInits | Trait
559558
val JavaProtected: FlagSet = JavaDefined | Protected
560-
val JavaInterface: FlagSet = JavaDefined | Trait
561559
val MethodOrLazy: FlagSet = Lazy | Method
562560
val MutableOrLazy: FlagSet = Lazy | Mutable
563561
val LiftedMethod: FlagSet = Lifted | Method
564-
val ParamAndLocal: FlagSet = Local | Param // TODO: merge with PrivateLocalParam?
565-
val PrivateLocalParam: FlagSet = Local | Param | Private
566-
val PrivateLocalParamAccessor: FlagSet = Local | ParamAccessor | Private
567-
val PrivateOrLocal: FlagSet = Local | Private // Labelled `private` or `protected[local]`
562+
val LocalParam: FlagSet = Local | Param
563+
val LocalParamAccessor: FlagSet = Local | ParamAccessor | Private
568564
val PrivateLocal: FlagSet = Local | Private // private[this]
569565
val ProtectedLocal: FlagSet = Local | Protected
570566
val MethodOrModule: FlagSet = Method | Module
@@ -575,14 +571,14 @@ object Flags {
575571
val ValidForeverFlags: FlagSet = Package | Permanent | Scala2ExistentialCommon
576572
val TermParamOrAccessor: FlagSet = Param | ParamAccessor
577573
val PrivateParamAccessor: FlagSet = ParamAccessor | Private
578-
val SyntheticOrPrivate: FlagSet = Private | Synthetic
574+
val PrivateOrSynthetic: FlagSet = Private | Synthetic
579575
val ClassTypeParam: FlagSet = Private | TypeParam
580576
val Scala2Trait: FlagSet = Scala2x | Trait
581-
val SyntheticDelegateMethod: FlagSet = Synthetic | Delegate | Method
582577
val SyntheticArtifact: FlagSet = Synthetic | Artifact
578+
val SyntheticCase: FlagSet = Synthetic | Case
579+
val SyntheticDelegateMethod: FlagSet = Synthetic | Delegate | Method
583580
val SyntheticModule: FlagSet = Synthetic | Module
581+
val SyntheticOpaque: FlagSet = Synthetic | Opaque
584582
val SyntheticTermParam: FlagSet = Synthetic | TermParam
585583
val SyntheticTypeParam: FlagSet = Synthetic | TypeParam
586-
val SyntheticCase: FlagSet = Synthetic | Case
587-
val SyntheticOpaque: FlagSet = Synthetic | Opaque
588584
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1019,7 +1019,7 @@ object SymDenotations {
10191019

10201020
/** A symbol is effectively final if it cannot be overridden in a subclass */
10211021
final def isEffectivelyFinal(implicit ctx: Context): Boolean =
1022-
isOneOf(EffectivelyFinalFlags) || !owner.isClass || owner.isOneOf(ModuleOrFinal) || owner.isAnonymousClass
1022+
isOneOf(EffectivelyFinalFlags) || !owner.isClass || owner.isOneOf(FinalOrModuleClass) || owner.isAnonymousClass
10231023

10241024
/** The class containing this denotation which has the given effective name. */
10251025
final def enclosingClassNamed(name: Name)(implicit ctx: Context): Symbol = {

‎compiler/src/dotty/tools/dotc/core/classfile/ClassfileParser.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -185,8 +185,8 @@ class ClassfileParser(
185185
if (isEnum) {
186186
instanceScope.toList.map(_.ensureCompleted())
187187
staticScope.toList.map(_.ensureCompleted())
188-
classRoot.setFlag(Flags.JavaEnum)
189-
moduleRoot.setFlag(Flags.JavaEnum)
188+
classRoot.setFlag(Flags.JavaEnumTrait)
189+
moduleRoot.setFlag(Flags.JavaEnumTrait)
190190
}
191191

192192
result
@@ -583,7 +583,7 @@ class ClassfileParser(
583583
parseExceptions(attrLen)
584584

585585
case tpnme.CodeATTR =>
586-
if (sym.owner.isAllOf(Flags.JavaTrait)) {
586+
if (sym.owner.isAllOf(Flags.JavaInterface)) {
587587
sym.resetFlag(Flags.Deferred)
588588
sym.owner.resetFlag(Flags.PureInterface)
589589
ctx.log(s"$sym in ${sym.owner} is a java8+ default method.")

‎compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -677,7 +677,7 @@ class TreeUnpickler(reader: TastyReader,
677677
case VALDEF | DEFDEF | TYPEDEF | TYPEPARAM | PARAM =>
678678
val sym = symbolAtCurrent()
679679
skipTree()
680-
if (sym.isTerm && !sym.isOneOf(MethodOrLazyOrDeferred))
680+
if (sym.isTerm && !sym.isOneOf(DeferredOrLazyOrMethod))
681681
initsFlags = EmptyFlags
682682
else if (sym.isClass ||
683683
sym.is(Method, butNot = Deferred) && !sym.isConstructor)

‎compiler/src/dotty/tools/dotc/parsing/JavaParsers.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -835,7 +835,7 @@ object JavaParsers {
835835
Select(New(javaLangDot(tpnme.Enum)), nme.CONSTRUCTOR), List(enumType)), Nil)
836836
val enumclazz = atSpan(start, nameOffset) {
837837
TypeDef(name,
838-
makeTemplate(superclazz :: interfaces, body, List(), true)).withMods(mods | Flags.JavaEnum)
838+
makeTemplate(superclazz :: interfaces, body, List(), true)).withMods(mods | Flags.JavaEnumTrait)
839839
}
840840
addCompanionObject(consts ::: statics ::: predefs, enumclazz)
841841
}
@@ -854,7 +854,7 @@ object JavaParsers {
854854
skipAhead()
855855
accept(RBRACE)
856856
}
857-
ValDef(name.toTermName, enumType, unimplementedExpr).withMods(Modifiers(Flags.JavaEnum | Flags.StableRealizable | Flags.JavaDefined | Flags.JavaStatic))
857+
ValDef(name.toTermName, enumType, unimplementedExpr).withMods(Modifiers(Flags.JavaEnumTrait | Flags.StableRealizable | Flags.JavaDefined | Flags.JavaStatic))
858858
}
859859
}
860860

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ class PlainPrinter(_ctx: Context) extends Printer {
391391
/** String representation of symbol's definition keyword */
392392
protected def keyString(sym: Symbol): String = {
393393
val flags = sym.flagsUNSAFE
394-
if (flags.isAllOf(JavaTrait)) "interface"
394+
if (flags.isAllOf(JavaInterface)) "interface"
395395
else if (flags.is(Trait)) "trait"
396396
else if (flags.is(Module)) "object"
397397
else if (sym.isClass) "class"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -830,7 +830,7 @@ class RefinedPrinter(_ctx: Context) extends PlainPrinter(_ctx) {
830830
protected def annotText(tree: untpd.Tree): Text = "@" ~ constrText(tree) // DD
831831

832832
protected def modText(mods: untpd.Modifiers, sym: Symbol, kw: String, isType: Boolean): Text = { // DD
833-
val suppressKw = if (enclDefIsClass) mods.isAllOf(ParamAndLocal) else mods.is(Param)
833+
val suppressKw = if (enclDefIsClass) mods.isAllOf(LocalParam) else mods.is(Param)
834834
var flagMask =
835835
if (ctx.settings.YdebugFlags.value) AnyFlags
836836
else if (suppressKw) PrintableFlags(isType) &~ Private

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ object messages {
316316
import core.Flags._
317317
val maxDist = 3
318318
val decls = site.decls.toList.flatMap { sym =>
319-
if (sym.flagsUNSAFE.isOneOf(Synthetic | PrivateOrLocal) || sym.isConstructor) Nil
319+
if (sym.flagsUNSAFE.isOneOf(Synthetic | PrivateLocal) || sym.isConstructor) Nil
320320
else List((sym.name.show, sym))
321321
}
322322

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ class AugmentScala2Traits extends MiniPhase with IdentityDenotTransformer { this
5656
info = MethodType(getter.info.resultType :: Nil, defn.UnitType))
5757

5858
for (sym <- mixin.info.decls) {
59-
if (sym.isGetter && !sym.isOneOf(LazyOrDeferred) && !sym.setter.exists &&
59+
if (sym.isGetter && !sym.isOneOf(DeferredOrLazy) && !sym.setter.exists &&
6060
!sym.info.resultType.isInstanceOf[ConstantType])
6161
traitSetter(sym.asTerm).enteredAfter(thisPhase)
6262
if ((sym.isAllOf(PrivateAccessor) && !sym.name.is(ExpandedName) &&

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ class Constructors extends MiniPhase with IdentityDenotTransformer { thisPhase =
9999
*/
100100
override def checkPostCondition(tree: tpd.Tree)(implicit ctx: Context): Unit = {
101101
def emptyRhsOK(sym: Symbol) =
102-
sym.isOneOf(LazyOrDeferred) || sym.isConstructor && sym.owner.isAllOf(NoInitsTrait)
102+
sym.isOneOf(DeferredOrLazy) || sym.isConstructor && sym.owner.isAllOf(NoInitsTrait)
103103
tree match {
104104
case tree: ValDef if tree.symbol.exists && tree.symbol.owner.isClass && !tree.symbol.is(Lazy) && !tree.symbol.hasAnnotation(defn.ScalaStaticAnnot) =>
105105
assert(tree.rhs.isEmpty, i"$tree: initializer should be moved to constructors")

‎compiler/src/dotty/tools/dotc/transform/patmat/Space.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -494,7 +494,7 @@ class SpaceEngine(implicit ctx: Context) extends SpaceLogic {
494494
)
495495
case tp if tp.isRef(defn.UnitClass) =>
496496
Typ(ConstantType(Constant(())), true) :: Nil
497-
case tp if tp.classSymbol.isAllOf(JavaEnum) =>
497+
case tp if tp.classSymbol.isAllOf(JavaEnumTrait) =>
498498
children.map(sym => Typ(sym.termRef, true))
499499
case tp =>
500500
val parts = children.map { sym =>
@@ -681,7 +681,7 @@ class SpaceEngine(implicit ctx: Context) extends SpaceLogic {
681681
isCheckable(and.tp1) || isCheckable(and.tp2)
682682
}) ||
683683
tpw.isRef(defn.BooleanClass) ||
684-
tpw.typeSymbol.isAllOf(JavaEnum) ||
684+
tpw.typeSymbol.isAllOf(JavaEnumTrait) ||
685685
(defn.isTupleType(tpw) && tpw.argInfos.exists(isCheckable(_)))
686686
}
687687

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ object RefChecks {
8383
* (Forwarding tends to hide problems by binding parameter names).
8484
*/
8585
private def upwardsThisType(cls: Symbol)(implicit ctx: Context) = cls.info match {
86-
case ClassInfo(_, _, _, _, tp: Type) if (tp ne cls.typeRef) && !cls.isOneOf(ModuleOrFinal) =>
86+
case ClassInfo(_, _, _, _, tp: Type) if (tp ne cls.typeRef) && !cls.isOneOf(FinalOrModuleClass) =>
8787
SkolemType(cls.appliedRef).withName(nme.this_)
8888
case _ =>
8989
cls.thisType
@@ -356,7 +356,7 @@ object RefChecks {
356356
// Also exclusion for implicit shortcut methods
357357
// Also excluded under Scala2 mode are overrides of default methods of Java traits.
358358
if (autoOverride(member) ||
359-
other.owner.isAllOf(JavaTrait) &&
359+
other.owner.isAllOf(JavaInterface) &&
360360
ctx.testScala2Mode("`override' modifier required when a Java 8 default method is re-implemented", member.sourcePos))
361361
member.setFlag(Override)
362362
else if (member.isType && self.memberInfo(member) =:= self.memberInfo(other))

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ trait TypeAssigner {
156156
avoid(expr.tpe, localSyms(bindings).filter(_.isTerm))
157157

158158
def avoidPrivateLeaks(sym: Symbol, pos: SourcePosition)(implicit ctx: Context): Type =
159-
if (!sym.isOneOf(SyntheticOrPrivate) && sym.owner.isClass) checkNoPrivateLeaks(sym, pos)
159+
if (!sym.isOneOf(PrivateOrSynthetic) && sym.owner.isClass) checkNoPrivateLeaks(sym, pos)
160160
else sym.info
161161

162162
private def toRepeated(tree: Tree, from: ClassSymbol)(implicit ctx: Context): Tree =

0 commit comments

Comments
 (0)