summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorEugene Burmako <xeno.by@gmail.com>2012-10-03 23:19:45 +0200
committerEugene Burmako <xeno.by@gmail.com>2012-10-03 23:56:28 +0200
commit7ee5bc9e549f07b8e73babce456e72539d7413d3 (patch)
treea85ad335e29212e37cb8a764150fe14fe30b00ec /src
parentb25f6514b77b1a93ea5a4a57041c9419e0efbe10 (diff)
downloadscala-7ee5bc9e549f07b8e73babce456e72539d7413d3.tar.gz
scala-7ee5bc9e549f07b8e73babce456e72539d7413d3.tar.bz2
scala-7ee5bc9e549f07b8e73babce456e72539d7413d3.zip
removes extraneous indirection from FlagValues
We don't really need that abstract type.
Diffstat (limited to 'src')
-rw-r--r--src/reflect/scala/reflect/api/FlagSets.scala4
-rw-r--r--src/reflect/scala/reflect/internal/FlagSets.scala2
2 files changed, 1 insertions, 5 deletions
diff --git a/src/reflect/scala/reflect/api/FlagSets.scala b/src/reflect/scala/reflect/api/FlagSets.scala
index 599c4ca426..3eda54b28a 100644
--- a/src/reflect/scala/reflect/api/FlagSets.scala
+++ b/src/reflect/scala/reflect/api/FlagSets.scala
@@ -21,14 +21,12 @@ trait FlagSets { self: Universe =>
val Flag: FlagValues
- type FlagValues >: Null <: FlagValuesApi
-
// Q: I have a pretty flag. Can I put it here?
// A: Only if there's a tree that cannot be built without it.
// If you want to put a flag here so that it can be tested against,
// introduce an `isXXX` method in one of the `api.Symbols` classes instead.
- trait FlagValuesApi {
+ trait FlagValues {
/** Flag indicating that tree represents a trait */
val TRAIT: FlagSet
diff --git a/src/reflect/scala/reflect/internal/FlagSets.scala b/src/reflect/scala/reflect/internal/FlagSets.scala
index 6270416d4f..6a3b6870a0 100644
--- a/src/reflect/scala/reflect/internal/FlagSets.scala
+++ b/src/reflect/scala/reflect/internal/FlagSets.scala
@@ -17,8 +17,6 @@ trait FlagSets extends api.FlagSets { self: SymbolTable =>
val NoFlags: FlagSet = 0L
- trait FlagValues extends FlagValuesApi
-
object Flag extends FlagValues {
val TRAIT : FlagSet = Flags.TRAIT
val INTERFACE : FlagSet = Flags.INTERFACE