summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukas Rytz <lukas.rytz@gmail.com>2016-06-06 10:50:09 +0200
committerLukas Rytz <lukas.rytz@gmail.com>2016-06-06 17:25:40 +0200
commita1ea0aa0a6136c13baa41268d7dbd4197924d3c9 (patch)
tree6b474cdbcb226e23819e4c26067d8b0c2c1eec29
parent2980c3921f1270f05add25239da93e05f64ad45f (diff)
downloadscala-a1ea0aa0a6136c13baa41268d7dbd4197924d3c9.tar.gz
scala-a1ea0aa0a6136c13baa41268d7dbd4197924d3c9.tar.bz2
scala-a1ea0aa0a6136c13baa41268d7dbd4197924d3c9.zip
Remove TopLevelCreationFlags
-rw-r--r--src/reflect/scala/reflect/internal/Flags.scala9
-rw-r--r--src/reflect/scala/reflect/internal/Mirrors.scala2
2 files changed, 3 insertions, 8 deletions
diff --git a/src/reflect/scala/reflect/internal/Flags.scala b/src/reflect/scala/reflect/internal/Flags.scala
index e2522ef280..e06decea6d 100644
--- a/src/reflect/scala/reflect/internal/Flags.scala
+++ b/src/reflect/scala/reflect/internal/Flags.scala
@@ -234,13 +234,8 @@ class Flags extends ModifierFlags {
*/
final val AllFlags = -1L
- /** These flags can be set when class or module symbol is first created.
- */
- final val TopLevelCreationFlags =
- MODULE | PACKAGE | FINAL | JAVA
-
// TODO - there's no call to slap four flags onto every package.
- final val PackageFlags = TopLevelCreationFlags
+ final val PackageFlags = MODULE | PACKAGE | FINAL | JAVA
// FINAL not included here due to possibility of object overriding.
// In fact, FINAL should not be attached regardless. We should be able
@@ -300,7 +295,7 @@ class Flags extends ModifierFlags {
final val ConstrFlags = JAVA
/** Module flags inherited by their module-class */
- final val ModuleToClassFlags = AccessFlags | TopLevelCreationFlags | CASE | SYNTHETIC
+ final val ModuleToClassFlags = AccessFlags | PackageFlags | CASE | SYNTHETIC
/** These flags are not pickled */
final val FlagsNotPickled = IS_ERROR | OVERLOADED | LIFTED | TRANS_FLAG | LOCKED | TRIEDCOOKING
diff --git a/src/reflect/scala/reflect/internal/Mirrors.scala b/src/reflect/scala/reflect/internal/Mirrors.scala
index 756300d403..3d1c160d52 100644
--- a/src/reflect/scala/reflect/internal/Mirrors.scala
+++ b/src/reflect/scala/reflect/internal/Mirrors.scala
@@ -273,7 +273,7 @@ trait Mirrors extends api.Mirrors {
// is very beneficial for a handful of bootstrap symbols to have
// first class identities
sealed trait WellKnownSymbol extends Symbol {
- this initFlags (TopLevelCreationFlags | STATIC)
+ this initFlags (PackageFlags | STATIC)
}
// Features common to RootClass and RootPackage, the roots of all
// type and term symbols respectively.