From dbc668f074b6e121f00a6a63ea55d1a3077f7eb1 Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Sun, 25 Oct 2015 12:29:00 +0100 Subject: Make Lazy and Trait "From Start" flags --- src/dotty/tools/dotc/core/Flags.scala | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/dotty/tools/dotc/core/Flags.scala b/src/dotty/tools/dotc/core/Flags.scala index 9ff6cfd95..1271d7f6a 100644 --- a/src/dotty/tools/dotc/core/Flags.scala +++ b/src/dotty/tools/dotc/core/Flags.scala @@ -227,6 +227,8 @@ object Flags { /** A trait */ final val Trait = typeFlag(10, "") + final val LazyOrTrait = Lazy.toCommonFlags + /** A value or variable accessor (getter or setter) */ final val Accessor = termFlag(11, "") @@ -315,7 +317,7 @@ object Flags { /** An unpickled Scala 2.x class */ final val Scala2x = typeFlag(26, "") - final val Scala2xOrSuperAccessor = SuperAccessor.toCommonFlags + final val SuperAccessorOrScala2x = SuperAccessor.toCommonFlags /** A method that has default params */ final val DefaultParameterized = termFlag(27, "") @@ -442,7 +444,7 @@ object Flags { AccessFlags | Module | Package | Deferred | Final | MethodOrHKCommon | Param | ParamAccessor | Scala2ExistentialCommon | InSuperCall | Touched | JavaStatic | CovariantOrOuter | ContravariantOrLabel | ExpandedName | AccessorOrSealed | CaseAccessorOrTypeArgument | Fresh | Frozen | Erroneous | ImplicitCommon | Permanent | - Scala2xOrSuperAccessor | SelfNameOrImplClass + LazyOrTrait | SuperAccessorOrScala2x | SelfNameOrImplClass assert(FromStartFlags.isTermFlags && FromStartFlags.isTypeFlags) // TODO: Should check that FromStartFlags do not change in completion -- cgit v1.2.3