Rename the ENUM / DEFAULTMETHOD flags to include JAVA_

Similar to the new JAVA_ANNOTATION flag, be more explicit about flags
for java entities.

1 files changed, 41 insertions, 41 deletions

diff --git a/src/reflect/scala/reflect/internal/HasFlags.scala b/src/reflect/scala/reflect/internal/HasFlags.scala
index 17f28ab1ca..5162b15206 100644
--- a/src/reflect/scala/reflect/internal/HasFlags.scala
+++ b/src/reflect/scala/reflect/internal/HasFlags.scala
@@ -79,50 +79,50 @@ trait HasFlags {
 
   // Tests which come through cleanly: both Symbol and Modifiers use these
   // identically, testing for a single flag.
-  def hasAbstractFlag    = hasFlag(ABSTRACT)
-  def hasAccessorFlag    = hasFlag(ACCESSOR)
-  def hasDefault         = hasFlag(DEFAULTPARAM) && hasFlag(METHOD | PARAM) // Second condition disambiguates with TRAIT
-  def hasEnumFlag        = hasFlag(ENUM)
+  def hasAbstractFlag       = hasFlag(ABSTRACT)
+  def hasAccessorFlag       = hasFlag(ACCESSOR)
+  def hasDefault            = hasFlag(DEFAULTPARAM) && hasFlag(METHOD | PARAM) // Second condition disambiguates with TRAIT
+  def hasJavaEnumFlag       = hasFlag(JAVA_ENUM)
   def hasJavaAnnotationFlag = hasFlag(JAVA_ANNOTATION)
   @deprecated("Use isLocalToThis instead", "2.11.0")
-  def hasLocalFlag       = hasFlag(LOCAL)
-  def isLocalToThis      = hasFlag(LOCAL)
-  def hasModuleFlag      = hasFlag(MODULE)
-  def hasPackageFlag     = hasFlag(PACKAGE)
-  def hasStableFlag      = hasFlag(STABLE)
-  def hasStaticFlag      = hasFlag(STATIC)
-  def isAbstractOverride = hasFlag(ABSOVERRIDE)
-  def isAnyOverride      = hasFlag(OVERRIDE | ABSOVERRIDE)
-  def isCase             = hasFlag(CASE)
-  def isCaseAccessor     = hasFlag(CASEACCESSOR)
-  def isDeferred         = hasFlag(DEFERRED)
-  def isFinal            = hasFlag(FINAL)
-  def isArtifact         = hasFlag(ARTIFACT)
-  def isImplicit         = hasFlag(IMPLICIT)
-  def isInterface        = hasFlag(INTERFACE)
-  def isJavaDefined      = hasFlag(JAVA)
-  def isLabel            = hasAllFlags(LABEL | METHOD) && !hasAccessorFlag
-  def isLazy             = hasFlag(LAZY)
-  def isLifted           = hasFlag(LIFTED)
-  def isMacro            = hasFlag(MACRO)
-  def isMutable          = hasFlag(MUTABLE)
-  def isOverride         = hasFlag(OVERRIDE)
-  def isParamAccessor    = hasFlag(PARAMACCESSOR)
-  def isPrivate          = hasFlag(PRIVATE)
+  def hasLocalFlag          = hasFlag(LOCAL)
+  def isLocalToThis         = hasFlag(LOCAL)
+  def hasModuleFlag         = hasFlag(MODULE)
+  def hasPackageFlag        = hasFlag(PACKAGE)
+  def hasStableFlag         = hasFlag(STABLE)
+  def hasStaticFlag         = hasFlag(STATIC)
+  def isAbstractOverride    = hasFlag(ABSOVERRIDE)
+  def isAnyOverride         = hasFlag(OVERRIDE | ABSOVERRIDE)
+  def isCase                = hasFlag(CASE)
+  def isCaseAccessor        = hasFlag(CASEACCESSOR)
+  def isDeferred            = hasFlag(DEFERRED)
+  def isFinal               = hasFlag(FINAL)
+  def isArtifact            = hasFlag(ARTIFACT)
+  def isImplicit            = hasFlag(IMPLICIT)
+  def isInterface           = hasFlag(INTERFACE)
+  def isJavaDefined         = hasFlag(JAVA)
+  def isLabel               = hasAllFlags(LABEL | METHOD) && !hasAccessorFlag
+  def isLazy                = hasFlag(LAZY)
+  def isLifted              = hasFlag(LIFTED)
+  def isMacro               = hasFlag(MACRO)
+  def isMutable             = hasFlag(MUTABLE)
+  def isOverride            = hasFlag(OVERRIDE)
+  def isParamAccessor       = hasFlag(PARAMACCESSOR)
+  def isPrivate             = hasFlag(PRIVATE)
   @deprecated ("Use `hasPackageFlag` instead", "2.11.0")
-  def isPackage          = hasFlag(PACKAGE)
-  def isPrivateLocal     = hasAllFlags(PrivateLocal)
-  def isProtected        = hasFlag(PROTECTED)
-  def isProtectedLocal   = hasAllFlags(ProtectedLocal)
-  def isPublic           = hasNoFlags(PRIVATE | PROTECTED) && !hasAccessBoundary
-  def isSealed           = hasFlag(SEALED)
-  def isSpecialized      = hasFlag(SPECIALIZED)
-  def isSuperAccessor    = hasFlag(SUPERACCESSOR)
-  def isSynthetic        = hasFlag(SYNTHETIC)
-  def isTrait            = hasFlag(TRAIT) && !hasFlag(PARAM)
-
-  def isDeferredOrDefault  = hasFlag(DEFERRED | DEFAULTMETHOD)
-  def isDeferredNotDefault = isDeferred && !hasFlag(DEFAULTMETHOD)
+  def isPackage             = hasFlag(PACKAGE)
+  def isPrivateLocal        = hasAllFlags(PrivateLocal)
+  def isProtected           = hasFlag(PROTECTED)
+  def isProtectedLocal      = hasAllFlags(ProtectedLocal)
+  def isPublic              = hasNoFlags(PRIVATE | PROTECTED) && !hasAccessBoundary
+  def isSealed              = hasFlag(SEALED)
+  def isSpecialized         = hasFlag(SPECIALIZED)
+  def isSuperAccessor       = hasFlag(SUPERACCESSOR)
+  def isSynthetic           = hasFlag(SYNTHETIC)
+  def isTrait               = hasFlag(TRAIT) && !hasFlag(PARAM)
+
+  def isDeferredOrJavaDefault  = hasFlag(DEFERRED | JAVA_DEFAULTMETHOD)
+  def isDeferredNotJavaDefault = isDeferred && !hasFlag(JAVA_DEFAULTMETHOD)
 
   def flagBitsToString(bits: Long): String = {
     // Fast path for common case