diff options
| author | Lukas Rytz <lukas.rytz@epfl.ch> | 2010-04-26 08:17:22 +0000 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@epfl.ch> | 2010-04-26 08:17:22 +0000 |
| commit | 9af947ea3a2c606efac01b1fcb5e88e0aeaadc08 (patch) | |
| tree | 2cbe94a5bed46e93a21154001f0463650804559b | |
| parent | ce27db80214ee574c6eace6339b7ab0a06344a61 (diff) | |
| download | scala-9af947ea3a2c606efac01b1fcb5e88e0aeaadc08.tar.gz scala-9af947ea3a2c606efac01b1fcb5e88e0aeaadc08.tar.bz2 scala-9af947ea3a2c606efac01b1fcb5e88e0aeaadc08.zip | |
moved AnnotationDefaultAttr to scala.runtime.
| -rw-r--r-- | src/compiler/scala/tools/nsc/symtab/Definitions.scala | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/compiler/scala/tools/nsc/symtab/Definitions.scala b/src/compiler/scala/tools/nsc/symtab/Definitions.scala index a2382063c3..db48189b6b 100644 --- a/src/compiler/scala/tools/nsc/symtab/Definitions.scala +++ b/src/compiler/scala/tools/nsc/symtab/Definitions.scala @@ -449,7 +449,8 @@ trait Definitions extends reflect.generic.StandardDefinitions { lazy val BooleanBeanPropertyAttr: Symbol = getClass(sn.BooleanBeanProperty) lazy val AnnotationDefaultAttr: Symbol = { - val attr = newClass(RootClass, nme.AnnotationDefaultATTR, List(AnnotationClass.typeConstructor)) + val RuntimePackageClass = getModule("scala.runtime").tpe.typeSymbol + val attr = newClass(RuntimePackageClass, nme.AnnotationDefaultATTR, List(AnnotationClass.typeConstructor)) // This attribute needs a constructor so that modifiers in parsed Java code make sense attr.info.decls enter (attr newConstructor NoPosition setInfo MethodType(Nil, attr.tpe)) attr @@ -815,7 +816,7 @@ trait Definitions extends reflect.generic.StandardDefinitions { StringClass, "+", anyparam, stringtype) setFlag FINAL val forced = List( // force initialization of every symbol that is entered as a side effect - AnnotationDefaultAttr, + AnnotationDefaultAttr, // #2264 RepeatedParamClass, JavaRepeatedParamClass, ByNameParamClass, @@ -839,9 +840,6 @@ trait Definitions extends reflect.generic.StandardDefinitions { Object_asInstanceOf ) - // #2264 - var tmp = AnnotationDefaultAttr - tmp = RepeatedParamClass // force initialization if (forMSIL) { val intType = IntClass.typeConstructor val intParam = List(intType) |