diff options
author | Jason Zaugg <jzaugg@gmail.com> | 2015-07-24 16:36:41 +1000 |
---|---|---|
committer | Jason Zaugg <jzaugg@gmail.com> | 2015-07-24 16:36:41 +1000 |
commit | aae695ed5aac7cd9724ef68f6366d21e812f4457 (patch) | |
tree | 7081af372bbf5504e2f24853743a8d3cba5a1149 /src/reflect/scala/reflect/internal/Symbols.scala | |
parent | 1a74e38366efe8b8fc1c189a591870603ef043a0 (diff) | |
parent | 59f1ee5989c43206676d831ff696b5d656ac6727 (diff) | |
download | scala-aae695ed5aac7cd9724ef68f6366d21e812f4457.tar.gz scala-aae695ed5aac7cd9724ef68f6366d21e812f4457.tar.bz2 scala-aae695ed5aac7cd9724ef68f6366d21e812f4457.zip |
Merge pull request #4638 from lrytz/t9393
SI-9393 fix modifiers of ClassBTypes for Java annotations
Diffstat (limited to 'src/reflect/scala/reflect/internal/Symbols.scala')
-rw-r--r-- | src/reflect/scala/reflect/internal/Symbols.scala | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/reflect/scala/reflect/internal/Symbols.scala b/src/reflect/scala/reflect/internal/Symbols.scala index 7740dbdd75..8a52f0b9d8 100644 --- a/src/reflect/scala/reflect/internal/Symbols.scala +++ b/src/reflect/scala/reflect/internal/Symbols.scala @@ -102,6 +102,9 @@ trait Symbols extends api.Symbols { self: SymbolTable => def isPrivateThis = (this hasFlag PRIVATE) && (this hasFlag LOCAL) def isProtectedThis = (this hasFlag PROTECTED) && (this hasFlag LOCAL) + def isJavaEnum: Boolean = hasJavaEnumFlag + def isJavaAnnotation: Boolean = hasJavaAnnotationFlag + def newNestedSymbol(name: Name, pos: Position, newFlags: Long, isClass: Boolean): Symbol = name match { case n: TermName => newTermSymbol(n, pos, newFlags) case n: TypeName => if (isClass) newClassSymbol(n, pos, newFlags) else newNonClassSymbol(n, pos, newFlags) @@ -732,7 +735,7 @@ trait Symbols extends api.Symbols { self: SymbolTable => final def flags: Long = { if (Statistics.hotEnabled) Statistics.incCounter(flagsCount) val fs = _rawflags & phase.flagMask - (fs | ((fs & LateFlags) >>> LateShift)) & ~(fs >>> AntiShift) + (fs | ((fs & LateFlags) >>> LateShift)) & ~((fs & AntiFlags) >>> AntiShift) } def flags_=(fs: Long) = _rawflags = fs def rawflags_=(x: Long) { _rawflags = x } |