simplify annotation derivation

adriaanm · adriaanm · commit 537d2ea8f355 · 2015-10-11T15:15:36.000+02:00
diff --git a/src/compiler/scala/tools/nsc/typechecker/MethodSynthesis.scala b/src/compiler/scala/tools/nsc/typechecker/MethodSynthesis.scala
@@ -22,17 +22,6 @@ trait MethodSynthesis {
   import definitions._
   import CODE._
 
-  /** The annotations amongst those found on the original symbol which
-   *  should be propagated to this kind of accessor.
-   */
-  def deriveAnnotations(initial: List[AnnotationInfo], category: Symbol, keepClean: Boolean): List[AnnotationInfo] = {
-    def annotationFilter(ann: AnnotationInfo) = ann.metaAnnotations match {
-      case Nil if ann.defaultTargets.isEmpty => keepClean                             // no meta-annotations or default targets
-      case Nil                               => ann.defaultTargets contains category  // default targets exist for ann
-      case metas                             => metas exists (_ matches category)     // meta-annotations attached to ann
-    }
-    initial filter annotationFilter
-  }
 
   class ClassMethodSynthesis(val clazz: Symbol, localTyper: Typer) {
     def mkThis = This(clazz) setPos clazz.pos.focus
@@ -160,13 +149,15 @@ trait MethodSynthesis {
       enterBeans(tree)
     }
 
+    import AnnotationInfo.{mkFilter => annotationFilter}
+
     /** This is called for those ValDefs which addDerivedTrees ignores, but
      *  which might have a warnable annotation situation.
      */
     private def warnForDroppedAnnotations(tree: Tree) {
       val annotations   = tree.symbol.initialize.annotations
       val targetClass   = defaultAnnotationTarget(tree)
-      val retained      = deriveAnnotations(annotations, targetClass, keepClean = true)
+      val retained      = annotations filter annotationFilter(targetClass, defaultRetention = true)
 
       annotations filterNot (retained contains _) foreach (ann => issueAnnotationWarning(tree, ann, targetClass))
     }
@@ -208,8 +199,8 @@ trait MethodSynthesis {
         context.unit.synthetics get meth match {
           case Some(mdef) =>
             context.unit.synthetics -= meth
-            meth setAnnotations deriveAnnotations(annotations, MethodTargetClass, keepClean = false)
-            cd.symbol setAnnotations deriveAnnotations(annotations, ClassTargetClass, keepClean = true)
+            meth setAnnotations (annotations filter annotationFilter(MethodTargetClass, defaultRetention = false))
+            cd.symbol setAnnotations (annotations filter annotationFilter(ClassTargetClass, defaultRetention = true))
             List(cd, mdef)
           case _ =>
             // Shouldn't happen, but let's give ourselves a reasonable error when it does
@@ -293,10 +284,6 @@ trait MethodSynthesis {
       def tree: ValDef
       final def enclClass = basisSym.enclClass
 
-      /** Which meta-annotation is associated with this kind of entity.
-       *  Presently one of: field, getter, setter, beanGetter, beanSetter, param.
-       */
-      def category: Symbol
 
       /* Explicit isSetter required for bean setters (beanSetterSym.isSetter is false) */
       final def completer(sym: Symbol) = namerOf(sym).accessorTypeCompleter(tree, isSetter)
@@ -307,7 +294,6 @@ trait MethodSynthesis {
 
       def isSetter   = false
       def isDeferred = mods.isDeferred
-      def keepClean  = false  // whether annotations whose definitions are not meta-annotated should be kept.
       def validate() { }
       def createAndEnterSymbol(): MethodSymbol = {
         val sym = owner.newMethod(name, tree.pos.focus, derivedMods.flags)
@@ -323,7 +309,32 @@ trait MethodSynthesis {
       }
       final def derive(initial: List[AnnotationInfo]): Tree = {
         validate()
-        derivedSym setAnnotations deriveAnnotations(initial, category, keepClean)
+
+        // Which meta-annotation is associated with this kind of entity.
+        // Presently one of: field, getter, setter, beanGetter, beanSetter, param.
+        // For traits, getter must play role of field as there isn't one until Constructors (we'll triage there)
+        val categories = this match {
+          case _: BaseGetter    => List(GetterTargetClass)
+          case _: Setter        => List(SetterTargetClass)
+          case _: BeanSetter    => List(BeanSetterTargetClass)
+          case _: AnyBeanGetter => List(BeanGetterTargetClass)
+          case _: Param         => List(ParamTargetClass)
+          case _: Field         => List(FieldTargetClass)
+        }
+
+        // whether annotations whose definitions are not meta-annotated should be kept.
+        val defaultRetention = this match {
+          case _: Param => true
+          // By default annotations go to the field, except if the field is
+          // generated for a class parameter (PARAMACCESSOR).
+          case _: Field                       => !mods.isParamAccessor
+          case _                              => false
+        }
+
+        // The annotations amongst those found on the original symbol which
+        // should be propagated to this kind of accessor.
+        val sym = derivedSym setAnnotations (initial filter annotationFilter(categories, defaultRetention))
+
         logDerived(derivedTree)
       }
     }
@@ -370,7 +381,6 @@ trait MethodSynthesis {
 
     sealed abstract class BaseGetter(tree: ValDef) extends DerivedGetter {
       def name       = tree.name
-      def category   = GetterTargetClass
       def flagsMask  = GetterFlags
       def flagsExtra = ACCESSOR.toLong | ( if (tree.mods.isMutable) 0 else STABLE )
 
@@ -450,11 +460,10 @@ trait MethodSynthesis {
     }
     case class Setter(tree: ValDef) extends DerivedSetter {
       def name       = tree.setterName
-      def category   = SetterTargetClass
       def flagsMask  = SetterFlags
       def flagsExtra = ACCESSOR
 
-      override def derivedSym = basisSym.setterIn(enclClass)
+      override def derivedSym = basisSym.setterIn(enclClass, hasExpandedName = false) // we'll expand it later
     }
 
     object Field {
@@ -470,18 +479,14 @@ trait MethodSynthesis {
       // NOTE: do not look at `vd.symbol` when called from `enterGetterSetter` (luckily, that call-site implies `!mods.isLazy`),
       // as the symbol info is in the process of being created then.
       // TODO: harmonize tree & symbol creation
-      // TODO: the `def field` call-site does not tollerate including `|| vd.symbol.owner.isTrait` --> tests break
-      def noFieldFor(vd: ValDef) = vd.mods.isDeferred || (vd.mods.isLazy && isUnitType(vd.symbol.info)) // || vd.symbol.owner.isTrait))
+      // TODO: the `def field` call-site breaks when you add `|| vd.symbol.owner.isTrait` (detected in test suite)
+      def noFieldFor(vd: ValDef) = vd.mods.isDeferred || (vd.mods.isLazy && isUnitType(vd.symbol.info)) || owner.isTrait
     }
 
     case class Field(tree: ValDef) extends DerivedFromValDef {
       def name       = tree.localName
-      def category   = FieldTargetClass
       def flagsMask  = FieldFlags
       def flagsExtra = PrivateLocal
-      // By default annotations go to the field, except if the field is
-      // generated for a class parameter (PARAMACCESSOR).
-      override def keepClean = !mods.isParamAccessor
 
       // handle lazy val first for now (we emit a Field even though we probably shouldn't...)
       override def derivedTree =
@@ -492,10 +497,8 @@ trait MethodSynthesis {
     }
     case class Param(tree: ValDef) extends DerivedFromValDef {
       def name       = tree.name
-      def category   = ParamTargetClass
       def flagsMask  = -1L
       def flagsExtra = 0L
-      override def keepClean = true
       override def derivedTree = EmptyTree
     }
     def validateParam(tree: ValDef) {
@@ -509,7 +512,6 @@ trait MethodSynthesis {
       override def derivedSym = enclClass.info decl name
     }
     sealed trait AnyBeanGetter extends BeanAccessor with DerivedGetter {
-      def category = BeanGetterTargetClass
       override def validate() {
         if (derivedSym == NoSymbol) {
           // the namer decides whether to generate these symbols or not. at that point, we don't
@@ -532,9 +534,7 @@ trait MethodSynthesis {
     }
     case class BooleanBeanGetter(tree: ValDef) extends BeanAccessor("is") with AnyBeanGetter { }
     case class BeanGetter(tree: ValDef) extends BeanAccessor("get") with AnyBeanGetter { }
-    case class BeanSetter(tree: ValDef) extends BeanAccessor("set") with DerivedSetter {
-      def category = BeanSetterTargetClass
-    }
+    case class BeanSetter(tree: ValDef) extends BeanAccessor("set") with DerivedSetter
 
     // No Symbols available.
     private def beanAccessorsFromNames(tree: ValDef) = {
diff --git a/src/reflect/scala/reflect/internal/AnnotationInfos.scala b/src/reflect/scala/reflect/internal/AnnotationInfos.scala
@@ -175,6 +175,22 @@ trait AnnotationInfos extends api.Annotations { self: SymbolTable =>
 
     def unapply(info: AnnotationInfo): Option[(Type, List[Tree], List[(Name, ClassfileAnnotArg)])] =
       Some((info.atp, info.args, info.assocs))
+
+    def mkFilter(category: Symbol, defaultRetention: Boolean)(ann: AnnotationInfo) =
+      (ann.metaAnnotations, ann.defaultTargets) match {
+        case (Nil, Nil)      => defaultRetention
+        case (Nil, defaults) => defaults contains category
+        case (metas, _)      => metas exists (_ matches category)
+      }
+
+    def mkFilter(categories: List[Symbol], defaultRetention: Boolean)(ann: AnnotationInfo) =
+      (ann.metaAnnotations, ann.defaultTargets) match {
+        case (Nil, Nil)      => defaultRetention
+        case (Nil, defaults) => categories exists defaults.contains
+        case (metas, _)      =>
+          val metaSyms = metas collect { case ann if !ann.symbol.isInstanceOf[StubSymbol] => ann.symbol }
+          categories exists (category => metaSyms exists (_ isNonBottomSubClass category))
+      }
   }
 
   class CompleteAnnotationInfo(
