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, 63 insertions, 63 deletions

diff --git a/src/reflect/scala/reflect/internal/Flags.scala b/src/reflect/scala/reflect/internal/Flags.scala
index ab56020713..754b96a9dd 100644
--- a/src/reflect/scala/reflect/internal/Flags.scala
+++ b/src/reflect/scala/reflect/internal/Flags.scala
@@ -15,65 +15,65 @@ import scala.collection.{ mutable, immutable }
 //
 // Generated by mkFlagsTable() at Thu Feb 02 20:31:52 PST 2012
 //
-//  0:     PROTECTED/M
-//  1:      OVERRIDE/M
-//  2:       PRIVATE/M
-//  3:      ABSTRACT/M
-//  4:      DEFERRED/M
-//  5:         FINAL/M
-//  6:          METHOD
-//  7:     INTERFACE/M
-//  8:          MODULE
-//  9:      IMPLICIT/M
-// 10:        SEALED/M
-// 11:          CASE/M
-// 12:       MUTABLE/M
-// 13:         PARAM/M
-// 14:         PACKAGE
-// 15:         MACRO/M
-// 16:   BYNAMEPARAM/M      CAPTURED COVARIANT/M
-// 17: CONTRAVARIANT/M INCONSTRUCTOR       LABEL
-// 18:   ABSOVERRIDE/M
-// 19:         LOCAL/M
-// 20:          JAVA/M
-// 21:       SYNTHETIC
-// 22:          STABLE
-// 23:        STATIC/M
-// 24:  CASEACCESSOR/M
-// 25:  DEFAULTPARAM/M       TRAIT/M
-// 26:          BRIDGE
-// 27:        ACCESSOR
-// 28:   SUPERACCESSOR
-// 29: PARAMACCESSOR/M
-// 30:       MODULEVAR
-// 31:          LAZY/M
-// 32:        IS_ERROR
-// 33:      OVERLOADED
-// 34:          LIFTED
-// 35:     EXISTENTIAL       MIXEDIN
-// 36:    EXPANDEDNAME
-// 37:       IMPLCLASS    PRESUPER/M
-// 38:      TRANS_FLAG
-// 39:          LOCKED
-// 40:     SPECIALIZED
-// 41:   DEFAULTINIT/M
-// 42:         VBRIDGE
-// 43:         VARARGS
-// 44:    TRIEDCOOKING
-// 45:  SYNCHRONIZED/M
-// 46:        ARTIFACT
-// 47: DEFAULTMETHOD/M
-// 48:            ENUM
+//  0:          PROTECTED/M
+//  1:           OVERRIDE/M
+//  2:            PRIVATE/M
+//  3:           ABSTRACT/M
+//  4:           DEFERRED/M
+//  5:              FINAL/M
+//  6:               METHOD
+//  7:          INTERFACE/M
+//  8:               MODULE
+//  9:           IMPLICIT/M
+// 10:             SEALED/M
+// 11:               CASE/M
+// 12:            MUTABLE/M
+// 13:              PARAM/M
+// 14:              PACKAGE
+// 15:              MACRO/M
+// 16:        BYNAMEPARAM/M      CAPTURED COVARIANT/M
+// 17:      CONTRAVARIANT/M INCONSTRUCTOR       LABEL
+// 18:        ABSOVERRIDE/M
+// 19:              LOCAL/M
+// 20:               JAVA/M
+// 21:            SYNTHETIC
+// 22:               STABLE
+// 23:             STATIC/M
+// 24:       CASEACCESSOR/M
+// 25:       DEFAULTPARAM/M       TRAIT/M
+// 26:               BRIDGE
+// 27:             ACCESSOR
+// 28:        SUPERACCESSOR
+// 29:      PARAMACCESSOR/M
+// 30:            MODULEVAR
+// 31:               LAZY/M
+// 32:             IS_ERROR
+// 33:           OVERLOADED
+// 34:               LIFTED
+// 35:          EXISTENTIAL       MIXEDIN
+// 36:         EXPANDEDNAME
+// 37:            IMPLCLASS    PRESUPER/M
+// 38:           TRANS_FLAG
+// 39:               LOCKED
+// 40:          SPECIALIZED
+// 41:        DEFAULTINIT/M
+// 42:              VBRIDGE
+// 43:              VARARGS
+// 44:         TRIEDCOOKING
+// 45:       SYNCHRONIZED/M
+// 46:             ARTIFACT
+// 47: JAVA_DEFAULTMETHOD/M
+// 48:            JAVA_ENUM
 // 49:      JAVA_ANNOTATION
 // 50:
-// 51:    lateDEFERRED
-// 52:       lateFINAL
-// 53:      lateMETHOD
-// 54:   lateINTERFACE
-// 55:      lateMODULE
-// 56:    notPROTECTED
-// 57:     notOVERRIDE
-// 58:      notPRIVATE
+// 51:         lateDEFERRED
+// 52:            lateFINAL
+// 53:           lateMETHOD
+// 54:        lateINTERFACE
+// 55:           lateMODULE
+// 56:         notPROTECTED
+// 57:          notOVERRIDE
+// 58:           notPRIVATE
 // 59:
 // 60:
 // 61:
@@ -119,9 +119,9 @@ class ModifierFlags {
   final val DEFAULTINIT   = 1L << 41      // symbol is initialized to the default value: used by -Xcheckinit
   final val ARTIFACT      = 1L << 46      // symbol should be ignored when typechecking; will be marked ACC_SYNTHETIC in bytecode
                                           // to see which symbols are marked as ARTIFACT, see scaladocs for FlagValues.ARTIFACT
-  final val DEFAULTMETHOD = 1L << 47      // symbol is a java default method
-  final val ENUM          = 1L << 48      // symbol is a java enum
-  final val JAVA_ANNOTATION    = 1L << 49      // symbol is a java annotation
+  final val JAVA_DEFAULTMETHOD = 1L << 47     // symbol is a java default method
+  final val JAVA_ENUM          = 1L << 48     // symbol is a java enum
+  final val JAVA_ANNOTATION    = 1L << 49     // symbol is a java annotation
 
   // Overridden.
   def flagToString(flag: Long): String = ""
@@ -260,7 +260,7 @@ class Flags extends ModifierFlags {
    */
   final val ExplicitFlags =
     PRIVATE | PROTECTED | ABSTRACT | FINAL | SEALED |
-    OVERRIDE | CASE | IMPLICIT | ABSOVERRIDE | LAZY | DEFAULTMETHOD
+    OVERRIDE | CASE | IMPLICIT | ABSOVERRIDE | LAZY | JAVA_DEFAULTMETHOD
 
   /** The two bridge flags */
   final val BridgeFlags = BRIDGE | VBRIDGE
@@ -451,8 +451,8 @@ class Flags extends ModifierFlags {
     case        TRIEDCOOKING => "<triedcooking>"                      // (1L << 44)
     case        SYNCHRONIZED => "<synchronized>"                      // (1L << 45)
     case            ARTIFACT => "<artifact>"                          // (1L << 46)
-    case       DEFAULTMETHOD => "<defaultmethod>"                     // (1L << 47)
-    case                ENUM => "<enum>"                              // (1L << 48)
+    case  JAVA_DEFAULTMETHOD => "<defaultmethod>"                     // (1L << 47)
+    case           JAVA_ENUM => "<enum>"                              // (1L << 48)
     case     JAVA_ANNOTATION => "<annotation>"                        // (1L << 49)
     case    0x4000000000000L => ""                                    // (1L << 50)
     case      `lateDEFERRED` => "<latedeferred>"                      // (1L << 51)