diff options
| author | Martin Odersky <odersky@gmail.com> | 2016-09-10 20:58:34 +0200 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2016-10-02 16:11:21 +0200 |
| commit | d575e585389b025d7b8056bcb43fea67dddd15d0 (patch) | |
| tree | 657453c9e17f109e29ead11d52807d1e335930ae /src/dotty/tools/dotc/core/Flags.scala | |
| parent | e93b7bfe770c8950a52d17bb0aebd3e0a5e93b3c (diff) | |
| download | dotty-d575e585389b025d7b8056bcb43fea67dddd15d0.tar.gz dotty-d575e585389b025d7b8056bcb43fea67dddd15d0.tar.bz2 dotty-d575e585389b025d7b8056bcb43fea67dddd15d0.zip | |
Make inline a keyword
`inline` is now a modifier keyword. To keep disruption tolerable,
we still allow `@inline` as an annotation as well. Other uses of
`inline` are supported only under `-language:Scala2` and are rewritten
to identifiers in backticks.
Diffstat (limited to 'src/dotty/tools/dotc/core/Flags.scala')
| -rw-r--r-- | src/dotty/tools/dotc/core/Flags.scala | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/dotty/tools/dotc/core/Flags.scala b/src/dotty/tools/dotc/core/Flags.scala index 0cdae6b98..bc5953a2c 100644 --- a/src/dotty/tools/dotc/core/Flags.scala +++ b/src/dotty/tools/dotc/core/Flags.scala @@ -450,7 +450,7 @@ object Flags { AccessFlags | Module | Package | Deferred | Final | MethodOrHKCommon | Param | ParamAccessor | Scala2ExistentialCommon | Mutable.toCommonFlags | InSuperCall | Touched | JavaStatic | CovariantOrOuter | ContravariantOrLabel | ExpandedName | AccessorOrSealed | CaseAccessorOrBaseTypeArg | Fresh | Frozen | Erroneous | ImplicitCommon | Permanent | Synthetic | - LazyOrTrait | SuperAccessorOrScala2x | SelfNameOrImplClass + Inline | LazyOrTrait | SuperAccessorOrScala2x | SelfNameOrImplClass assert(FromStartFlags.isTermFlags && FromStartFlags.isTypeFlags) // TODO: Should check that FromStartFlags do not change in completion @@ -541,6 +541,9 @@ object Flags { /** A type parameter with synthesized name */ final val ExpandedTypeParam = allOf(ExpandedName, TypeParam) + /** An inline method */ + final val InlineMethod = allOf(Inline, Method) + /** A parameter or parameter accessor */ final val ParamOrAccessor = Param | ParamAccessor |