diff options
| author | Lukas Rytz <lukas.rytz@epfl.ch> | 2010-10-14 12:26:07 +0000 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@epfl.ch> | 2010-10-14 12:26:07 +0000 |
| commit | a4865203eb625a02bd4bb0e9f6b2930f56df9e70 (patch) | |
| tree | 3a20adb709d7b7576628faccf69c0b2fda03c162 | |
| parent | af200c9594f2bdad13c376d492bec83847fff9c9 (diff) | |
| download | scala-a4865203eb625a02bd4bb0e9f6b2930f56df9e70.tar.gz scala-a4865203eb625a02bd4bb0e9f6b2930f56df9e70.tar.bz2 scala-a4865203eb625a02bd4bb0e9f6b2930f56df9e70.zip | |
re-added isAbstract and isTrait to HasFlag beca...
re-added isAbstract and isTrait to HasFlag because sbt build breaks
otherwise (compiler-interface accesses Modifiers.isAbstract). note that
the sbt build still doesn't work right now because of a bug in r23232.
hubert is working on that. review by extempore.
| -rw-r--r-- | src/library/scala/reflect/generic/HasFlags.scala | 4 | ||||
| -rwxr-xr-x | src/library/scala/reflect/generic/Symbols.scala | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/library/scala/reflect/generic/HasFlags.scala b/src/library/scala/reflect/generic/HasFlags.scala index 7dfb3506f6..27c591c6ae 100644 --- a/src/library/scala/reflect/generic/HasFlags.scala +++ b/src/library/scala/reflect/generic/HasFlags.scala @@ -173,7 +173,7 @@ trait HasFlags { // DEFAULTPARAM overloaded with TRAIT def hasDefault = isParameter && hasFlag(DEFAULTPARAM) def hasDefaultFlag = hasFlag(DEFAULTPARAM) - // def isTrait = hasFlag(TRAIT ) + @deprecated("") def isTrait = hasFlag(TRAIT) // def isTrait: Boolean = isClass && hasFlag(TRAIT) // refined later for virtual classes. // Straightforwardly named accessors already being used differently @@ -185,7 +185,7 @@ trait HasFlags { // ABSTRACT and DEFERRED too easy to confuse, and // ABSTRACT + OVERRIDE ==> ABSOVERRIDE adds to it. // - // def isAbstract = hasFlag(ABSTRACT ) + @deprecated("") def isAbstract = hasFlag(ABSTRACT) // final def isAbstractClass = isClass && hasFlag(ABSTRACT) // def isAbstractType = false // to be overridden diff --git a/src/library/scala/reflect/generic/Symbols.scala b/src/library/scala/reflect/generic/Symbols.scala index 75e1c05d49..fe541cd6a9 100755 --- a/src/library/scala/reflect/generic/Symbols.scala +++ b/src/library/scala/reflect/generic/Symbols.scala @@ -128,7 +128,7 @@ trait Symbols { self: Universe => def isAbstractType = false // to be overridden private[scala] def isSkolem = false // to be overridden - def isTrait: Boolean = isClass && hasFlag(TRAIT) // refined later for virtual classes. + override def isTrait: Boolean = isClass && hasFlag(TRAIT) // refined later for virtual classes. final def isAbstractClass = isClass && hasFlag(ABSTRACT) final def isAbstractOverride = isTerm && hasFlag(ABSOVERRIDE) final def isBridge = hasFlag(BRIDGE) |