diff options
| author | Martin Odersky <odersky@gmail.com> | 2015-12-07 13:46:36 +0100 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2015-12-14 14:30:07 +0100 |
| commit | ef66db271c573adb0fc47dcce76bbac0fcc59ed7 (patch) | |
| tree | fae3be60c601acf1da003753f18b4d65d49f6828 /src/dotty/tools/dotc/core/Flags.scala | |
| parent | 886b74d63969458e808d251d65a9f6ecca56f262 (diff) | |
| download | dotty-ef66db271c573adb0fc47dcce76bbac0fcc59ed7.tar.gz dotty-ef66db271c573adb0fc47dcce76bbac0fcc59ed7.tar.bz2 dotty-ef66db271c573adb0fc47dcce76bbac0fcc59ed7.zip | |
Rename TypeArgument -> BaseTypeArg flag.
Describes its meaning more accurately.
Diffstat (limited to 'src/dotty/tools/dotc/core/Flags.scala')
| -rw-r--r-- | src/dotty/tools/dotc/core/Flags.scala | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/dotty/tools/dotc/core/Flags.scala b/src/dotty/tools/dotc/core/Flags.scala index c8a9dc13b..c859fae3e 100644 --- a/src/dotty/tools/dotc/core/Flags.scala +++ b/src/dotty/tools/dotc/core/Flags.scala @@ -306,10 +306,12 @@ object Flags { /** A case parameter accessor */ final val CaseAccessor = termFlag(25, "<caseaccessor>") - /** An type parameter which is an alias for some other (non-visible) type parameter */ - final val TypeArgument = typeFlag(25, "<type-param-inst>") + /** A binding for a type parameter of a base class or trait. + * TODO: Replace with combination of isType, ExpandedName, and Override? + */ + final val BaseTypeArg = typeFlag(25, "<basetypearg>") - final val CaseAccessorOrTypeArgument = CaseAccessor.toCommonFlags + final val CaseAccessorOrBaseTypeArg = CaseAccessor.toCommonFlags /** A super accessor */ final val SuperAccessor = termFlag(26, "<superaccessor>") @@ -446,7 +448,7 @@ object Flags { final val FromStartFlags = AccessFlags | Module | Package | Deferred | Final | MethodOrHKCommon | Param | ParamAccessor | Scala2ExistentialCommon | InSuperCall | Touched | JavaStatic | CovariantOrOuter | ContravariantOrLabel | ExpandedName | AccessorOrSealed | - CaseAccessorOrTypeArgument | Fresh | Frozen | Erroneous | ImplicitCommon | Permanent | + CaseAccessorOrBaseTypeArg | Fresh | Frozen | Erroneous | ImplicitCommon | Permanent | LazyOrTrait | SuperAccessorOrScala2x | SelfNameOrImplClass assert(FromStartFlags.isTermFlags && FromStartFlags.isTypeFlags) @@ -545,7 +547,7 @@ object Flags { final val TypeParamOrAccessor = TypeParam | TypeParamAccessor /** If symbol of a type alias has these flags, prefer the alias */ - final val AliasPreferred = TypeParam | TypeArgument | ExpandedName + final val AliasPreferred = TypeParam | BaseTypeArg | ExpandedName /** A covariant type parameter instance */ final val LocalCovariant = allOf(Local, Covariant) |