aboutsummaryrefslogtreecommitdiff
path: root/src/dotty/tools/dotc/core/Flags.scala
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2013-10-09 12:42:04 +0200
committerMartin Odersky <odersky@gmail.com>2013-10-09 12:42:17 +0200
commitf703e4d9c006a119250e1b0202712fe3e09521b4 (patch)
tree11591699d73cc08e252b6cd269dd8ae2edb4986c /src/dotty/tools/dotc/core/Flags.scala
parent0fc19e0e1ef7b56f9ca0649fde35765892cf1a53 (diff)
downloaddotty-f703e4d9c006a119250e1b0202712fe3e09521b4.tar.gz
dotty-f703e4d9c006a119250e1b0202712fe3e09521b4.tar.bz2
dotty-f703e4d9c006a119250e1b0202712fe3e09521b4.zip
Partial revert of "instance flags" commit
16c1ddd3bb86c61890418b8394d44486e7bbd9dd
Diffstat (limited to 'src/dotty/tools/dotc/core/Flags.scala')
-rw-r--r--src/dotty/tools/dotc/core/Flags.scala10
1 files changed, 1 insertions, 9 deletions
diff --git a/src/dotty/tools/dotc/core/Flags.scala b/src/dotty/tools/dotc/core/Flags.scala
index 593fb2bbb..21ed04112 100644
--- a/src/dotty/tools/dotc/core/Flags.scala
+++ b/src/dotty/tools/dotc/core/Flags.scala
@@ -294,11 +294,6 @@ object Flags {
/** A case parameter (or its accessor, or a GADT skolem) */
final val CaseAccessor = termFlag(26, "<caseaccessor>")
- /** An type parameter which is an alias for some other type parameter */
- final val TypeParamInstance = typeFlag(26, "<type-param-inst>")
-
- final val CaseAccessorOrTypeParamInstance = CaseAccessor.toCommonFlags
-
/** A super accessor */
final val SuperAccessor = termFlag(27, "<superaccessor>")
@@ -394,7 +389,7 @@ object Flags {
final val FromStartFlags =
AccessFlags | Module | Package | Deferred | Param | Scala2ExistentialCommon | Touched |
Static | CovariantCommon | ContravariantCommon | ExpandedName | AccessorOrSealed |
- CaseAccessorOrTypeParamInstance | Frozen | Erroneous | ImplicitCommon | Permanent
+ Frozen | Erroneous | ImplicitCommon | Permanent
assert(FromStartFlags.isTermFlags && FromStartFlags.isTypeFlags)
// TODO: Should check that FromStartFlags do not change in completion
@@ -463,9 +458,6 @@ object Flags {
/** A contravariant type parameter instance */
final val LocalContravariant = allOf(Local, Contravariant)
- /** A covariant type parameter instance */
- final val TypeParamOrInstance = TypeParam | TypeParamInstance
-
/** Has defined or inherited default parameters */
final val HasDefaultParams = DefaultParameterized | InheritedDefaultParams