diff options
author | Paul Phillips <paulp@improving.org> | 2011-06-16 19:40:40 +0000 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2011-06-16 19:40:40 +0000 |
commit | 916d5f2de0ddbae60b2a1ae18bb3ab0d96f84897 (patch) | |
tree | 58b8f4c3475b4ddb2e62f248b6bac9202d5e487f /src | |
parent | 270c0cb80df85b613cfa3e5f85f70cf1f35e2388 (diff) | |
download | scala-916d5f2de0ddbae60b2a1ae18bb3ab0d96f84897.tar.gz scala-916d5f2de0ddbae60b2a1ae18bb3ab0d96f84897.tar.bz2 scala-916d5f2de0ddbae60b2a1ae18bb3ab0d96f84897.zip |
Deprecated scala.reflect.generic, except for By...
Deprecated scala.reflect.generic, except for ByteCodecs. After we move
some non-internal things out of scala.reflect.internal we should go back
and improve some deprecation messages (i.e. point somewhere useful.) No
review.
Diffstat (limited to 'src')
17 files changed, 17 insertions, 30 deletions
diff --git a/src/compiler/scala/reflect/internal/Symbols.scala b/src/compiler/scala/reflect/internal/Symbols.scala index 131fe78db0..5cdd979a3e 100644 --- a/src/compiler/scala/reflect/internal/Symbols.scala +++ b/src/compiler/scala/reflect/internal/Symbols.scala @@ -507,14 +507,7 @@ trait Symbols /* extends reflect.generic.Symbols*/ { self: SymbolTable => final def isLocal: Boolean = owner.isTerm /** Is this symbol a constant? */ - final def isConstant: Boolean = - isStable && (tpe match { - case ConstantType(_) => true - case PolyType(_, ConstantType(_)) => true - case MethodType(_, ConstantType(_)) => true - case NullaryMethodType(ConstantType(_)) => true - case _ => false - }) + final def isConstant: Boolean = isStable && isConstantType(tpe.resultType) /** Is this class nested in another class or module (not a package)? */ final def isNestedClass: Boolean = diff --git a/src/library/scala/reflect/generic/AnnotationInfos.scala b/src/library/scala/reflect/generic/AnnotationInfos.scala index 6239ca189c..f995a2b340 100755 --- a/src/library/scala/reflect/generic/AnnotationInfos.scala +++ b/src/library/scala/reflect/generic/AnnotationInfos.scala @@ -1,7 +1,7 @@ package scala.reflect package generic -trait AnnotationInfos { self: Universe => +@deprecated("scala.reflect.generic will be removed", "2.9.1") trait AnnotationInfos { self: Universe => type AnnotationInfo <: AnyRef val AnnotationInfo: AnnotationInfoExtractor diff --git a/src/library/scala/reflect/generic/ByteCodecs.scala b/src/library/scala/reflect/generic/ByteCodecs.scala index ae15e2941b..8993e068d9 100644 --- a/src/library/scala/reflect/generic/ByteCodecs.scala +++ b/src/library/scala/reflect/generic/ByteCodecs.scala @@ -214,11 +214,3 @@ object ByteCodecs { decode7to8(xs, len) } } - - - - - - - - diff --git a/src/library/scala/reflect/generic/Constants.scala b/src/library/scala/reflect/generic/Constants.scala index 88a213481d..ca04fdac9e 100755 --- a/src/library/scala/reflect/generic/Constants.scala +++ b/src/library/scala/reflect/generic/Constants.scala @@ -9,7 +9,7 @@ package generic import java.lang.Integer.toOctalString import annotation.switch -trait Constants { +@deprecated("scala.reflect.generic will be removed", "2.9.1") trait Constants { self: Universe => import definitions._ diff --git a/src/library/scala/reflect/generic/Flags.scala b/src/library/scala/reflect/generic/Flags.scala index 3291047831..b56faf8934 100755 --- a/src/library/scala/reflect/generic/Flags.scala +++ b/src/library/scala/reflect/generic/Flags.scala @@ -3,7 +3,7 @@ package generic /** Flags set on Modifiers instances in the parsing stage. */ -class ModifierFlags { +@deprecated("scala.reflect.generic will be removed", "2.9.1") class ModifierFlags { final val IMPLICIT = 0x00000200 final val FINAL = 0x00000020 final val PRIVATE = 0x00000004 @@ -43,7 +43,7 @@ class ModifierFlags { } object ModifierFlags extends ModifierFlags -class Flags extends ModifierFlags { +@deprecated("scala.reflect.generic will be removed", "2.9.1") class Flags extends ModifierFlags { final val METHOD = 0x00000040 // a method final val MODULE = 0x00000100 // symbol is module or class implementing a module final val PACKAGE = 0x00004000 // symbol is a java package diff --git a/src/library/scala/reflect/generic/HasFlags.scala b/src/library/scala/reflect/generic/HasFlags.scala index ca8e2ede86..3d9d121adf 100644 --- a/src/library/scala/reflect/generic/HasFlags.scala +++ b/src/library/scala/reflect/generic/HasFlags.scala @@ -76,7 +76,7 @@ import Flags._ /** Common code utilized by Modifiers (which carry the flags associated * with Trees) and Symbol. */ -trait HasFlags { +@deprecated("scala.reflect.generic will be removed", "2.9.1") trait HasFlags { type FlagsType type AccessBoundaryType type AnnotationType diff --git a/src/library/scala/reflect/generic/Names.scala b/src/library/scala/reflect/generic/Names.scala index 90c38c04b3..1906a99b8b 100755 --- a/src/library/scala/reflect/generic/Names.scala +++ b/src/library/scala/reflect/generic/Names.scala @@ -1,7 +1,7 @@ package scala.reflect package generic -trait Names { +@deprecated("scala.reflect.generic will be removed", "2.9.1") trait Names { type Name >: Null <: AnyRef type TypeName <: Name type TermName <: Name diff --git a/src/library/scala/reflect/generic/PickleBuffer.scala b/src/library/scala/reflect/generic/PickleBuffer.scala index c56d55fa1d..f52a248f3c 100755 --- a/src/library/scala/reflect/generic/PickleBuffer.scala +++ b/src/library/scala/reflect/generic/PickleBuffer.scala @@ -12,7 +12,7 @@ package generic * @param from The first index where defined data are found * @param to The first index where new data can be written */ -class PickleBuffer(data: Array[Byte], from: Int, to: Int) { +@deprecated("scala.reflect.generic will be removed", "2.9.1") class PickleBuffer(data: Array[Byte], from: Int, to: Int) { var bytes = data var readIndex = from diff --git a/src/library/scala/reflect/generic/PickleFormat.scala b/src/library/scala/reflect/generic/PickleFormat.scala index 1667e8c24f..c6308e7db8 100755 --- a/src/library/scala/reflect/generic/PickleFormat.scala +++ b/src/library/scala/reflect/generic/PickleFormat.scala @@ -9,7 +9,7 @@ package generic * @author Martin Odersky * @version 1.0 */ -object PickleFormat { +@deprecated("scala.reflect.generic will be removed", "2.9.1") object PickleFormat { /*************************************************** * Symbol table attribute format: diff --git a/src/library/scala/reflect/generic/Scopes.scala b/src/library/scala/reflect/generic/Scopes.scala index 9aff63d958..5ca7c95467 100755 --- a/src/library/scala/reflect/generic/Scopes.scala +++ b/src/library/scala/reflect/generic/Scopes.scala @@ -1,7 +1,7 @@ package scala.reflect package generic -trait Scopes { self: Universe => +@deprecated("scala.reflect.generic will be removed", "2.9.1") trait Scopes { self: Universe => abstract class AbsScope extends Iterable[Symbol] { private[reflect] def enter(sym: Symbol): Symbol diff --git a/src/library/scala/reflect/generic/StandardDefinitions.scala b/src/library/scala/reflect/generic/StandardDefinitions.scala index 75fe2b9200..49ac1d37a9 100755 --- a/src/library/scala/reflect/generic/StandardDefinitions.scala +++ b/src/library/scala/reflect/generic/StandardDefinitions.scala @@ -6,7 +6,7 @@ package scala.reflect package generic -trait StandardDefinitions { self: Universe => +@deprecated("scala.reflect.generic will be removed", "2.9.1") trait StandardDefinitions { self: Universe => val definitions: AbsDefinitions diff --git a/src/library/scala/reflect/generic/StdNames.scala b/src/library/scala/reflect/generic/StdNames.scala index 3d4cdc46ce..8f8d695016 100755 --- a/src/library/scala/reflect/generic/StdNames.scala +++ b/src/library/scala/reflect/generic/StdNames.scala @@ -3,7 +3,7 @@ package generic import scala.reflect.NameTransformer -trait StdNames { +@deprecated("scala.reflect.generic will be removed", "2.9.1") trait StdNames { self: Universe => val nme: LibraryTermNames diff --git a/src/library/scala/reflect/generic/Symbols.scala b/src/library/scala/reflect/generic/Symbols.scala index 3614bfdeb4..a58711663e 100755 --- a/src/library/scala/reflect/generic/Symbols.scala +++ b/src/library/scala/reflect/generic/Symbols.scala @@ -3,7 +3,7 @@ package generic import Flags._ -trait Symbols { self: Universe => +@deprecated("scala.reflect.generic will be removed", "2.9.1") trait Symbols { self: Universe => type Symbol >: Null <: AbsSymbol diff --git a/src/library/scala/reflect/generic/Trees.scala b/src/library/scala/reflect/generic/Trees.scala index baf36c9749..d44f6b5b8f 100755 --- a/src/library/scala/reflect/generic/Trees.scala +++ b/src/library/scala/reflect/generic/Trees.scala @@ -4,7 +4,7 @@ package generic import java.io.{ PrintWriter, StringWriter } import Flags._ -trait Trees { self: Universe => +@deprecated("scala.reflect.generic will be removed", "2.9.1") trait Trees { self: Universe => abstract class AbsTreePrinter(out: PrintWriter) { def print(tree: Tree) diff --git a/src/library/scala/reflect/generic/Types.scala b/src/library/scala/reflect/generic/Types.scala index c0eded6ab7..837f5484db 100755 --- a/src/library/scala/reflect/generic/Types.scala +++ b/src/library/scala/reflect/generic/Types.scala @@ -1,7 +1,7 @@ package scala.reflect package generic -trait Types { self: Universe => +@deprecated("scala.reflect.generic will be removed", "2.9.1") trait Types { self: Universe => abstract class AbsType { def typeSymbol: Symbol diff --git a/src/library/scala/reflect/generic/UnPickler.scala b/src/library/scala/reflect/generic/UnPickler.scala index 6fca886e64..3bae268295 100755 --- a/src/library/scala/reflect/generic/UnPickler.scala +++ b/src/library/scala/reflect/generic/UnPickler.scala @@ -18,6 +18,7 @@ import annotation.switch /** @author Martin Odersky * @version 1.0 */ +@deprecated("scala.reflect.generic will be removed", "2.9.1") abstract class UnPickler { val global: Universe diff --git a/src/library/scala/reflect/generic/Universe.scala b/src/library/scala/reflect/generic/Universe.scala index 101295ae79..4bc70044ae 100755 --- a/src/library/scala/reflect/generic/Universe.scala +++ b/src/library/scala/reflect/generic/Universe.scala @@ -1,6 +1,7 @@ package scala.reflect package generic +@deprecated("scala.reflect.generic will be removed", "2.9.1") abstract class Universe extends Symbols with Types with Constants |