Reworking of annotation arg parser.

Paradoxically it has less duplication but is longer.
That's the way it goes sometimes.

2 files changed, 57 insertions, 37 deletions

diff --git a/src/library/scala/runtime/ScalaRunTime.scala b/src/library/scala/runtime/ScalaRunTime.scala
index 045fb5b252..bb7a26a8c5 100644
--- a/src/library/scala/runtime/ScalaRunTime.scala
+++ b/src/library/scala/runtime/ScalaRunTime.scala
@@ -15,6 +15,7 @@ import scala.collection.generic.{ Sorted }
 import scala.reflect.{ ClassTag, classTag }
 import scala.util.control.ControlThrowable
 import scala.xml.{ Node, MetaData }
+import java.lang.{ Class => jClass }
 
 import java.lang.Double.doubleToLongBits
 import java.lang.reflect.{ Modifier, Method => JMethod }
@@ -28,10 +29,10 @@ object ScalaRunTime {
   def isArray(x: Any, atLevel: Int): Boolean =
     x != null && isArrayClass(x.getClass, atLevel)
 
-  private def isArrayClass(clazz: Class[_], atLevel: Int): Boolean =
+  private def isArrayClass(clazz: jClass[_], atLevel: Int): Boolean =
     clazz.isArray && (atLevel == 1 || isArrayClass(clazz.getComponentType, atLevel - 1))
 
-  def isValueClass(clazz: Class[_]) = clazz.isPrimitive()
+  def isValueClass(clazz: jClass[_]) = clazz.isPrimitive()
   def isTuple(x: Any) = x != null && tupleNames(x.getClass.getName)
   def isAnyVal(x: Any) = x match {
     case _: Byte | _: Short | _: Char | _: Int | _: Long | _: Float | _: Double | _: Boolean | _: Unit => true
@@ -50,7 +51,7 @@ object ScalaRunTime {
 
   /** Return the class object representing an array with element class `clazz`.
    */
-  def arrayClass(clazz: Class[_]): Class[_] = {
+  def arrayClass(clazz: jClass[_]): jClass[_] = {
     // newInstance throws an exception if the erasure is Void.TYPE. see SI-5680
     if (clazz == java.lang.Void.TYPE) classOf[Array[Unit]]
     else java.lang.reflect.Array.newInstance(clazz, 0).getClass
@@ -58,18 +59,19 @@ object ScalaRunTime {
 
   /** Return the class object representing elements in arrays described by a given schematic.
    */
-  def arrayElementClass(schematic: Any): Class[_] = schematic match {
-    case cls: Class[_] => cls.getComponentType
+  def arrayElementClass(schematic: Any): jClass[_] = schematic match {
+    case cls: jClass[_]   => cls.getComponentType
     case tag: ClassTag[_] => tag.runtimeClass
-    case _ => throw new UnsupportedOperationException("unsupported schematic %s (%s)".format(schematic, if (schematic == null) "null" else schematic.getClass))
+    case _                =>
+      throw new UnsupportedOperationException(s"unsupported schematic $schematic (${schematic.getClass})")
   }
 
   /** Return the class object representing an unboxed value type,
    *  e.g. classOf[int], not classOf[java.lang.Integer].  The compiler
    *  rewrites expressions like 5.getClass to come here.
    */
-  def anyValClass[T <: AnyVal : ClassTag](value: T): Class[T] =
-    classTag[T].runtimeClass.asInstanceOf[Class[T]]
+  def anyValClass[T <: AnyVal : ClassTag](value: T): jClass[T] =
+    classTag[T].runtimeClass.asInstanceOf[jClass[T]]
 
   /** Retrieve generic array element */
   def array_apply(xs: AnyRef, idx: Int): Any = xs match {
diff --git a/src/reflect/scala/reflect/runtime/JavaMirrors.scala b/src/reflect/scala/reflect/runtime/JavaMirrors.scala
index 6977b43d73..9b46e2db61 100644
--- a/src/reflect/scala/reflect/runtime/JavaMirrors.scala
+++ b/src/reflect/scala/reflect/runtime/JavaMirrors.scala
@@ -136,6 +136,53 @@ trait JavaMirrors extends internal.SymbolTable with api.JavaUniverse { self: Sym
     private def ErrorNotConstructor(sym: Symbol, owner: Symbol) = throw new ScalaReflectionException(s"expected a constructor of $owner, you provided $sym")
     private def ErrorFree(member: Symbol, freeType: Symbol) = throw new ScalaReflectionException(s"cannot reflect ${member.kindString} ${member.name}, because it's a member of a weak type ${freeType.name}")
 
+    /** Helper functions for extracting typed values from a (Class[_], Any)
+     *  representing an annotation argument.
+     */
+    private object toAnnotArg {
+      val        StringClass = classOf[String]
+      val         ClassClass = classOf[jClass[_]]
+      object  PrimitiveClass { def unapply(x: jClass[_]) = x.isPrimitive }
+      object       EnumClass { def unapply(x: jClass[_]) = x.isEnum }
+      object      ArrayClass { def unapply(x: jClass[_]) = x.isArray }
+      object AnnotationClass { def unapply(x: jClass[_]) = x.isAnnotation }
+
+      object ConstantArg {
+        def enumToSymbol(enum: Enum[_]): Symbol =
+          classToScala(enum.getClass).typeSignature.declaration(enum.name: TermName)
+
+        def unapply(schemaAndValue: (jClass[_], Any)): Option[Any] = schemaAndValue match {
+          case (StringClass | PrimitiveClass(), value) => Some(value)
+          case (ClassClass, value: jClass[_])          => Some(classToScala(value).toType)
+          case (EnumClass(), value: Enum[_])           => Some(enumToSymbol(value))
+          case _                                       => None
+        }
+      }
+      def apply(schemaAndValue: (jClass[_], Any)): ClassfileAnnotArg = schemaAndValue match {
+        case ConstantArg(value)                      => LiteralAnnotArg(Constant(value))
+        case (clazz @ ArrayClass(), value: Array[_]) => ArrayAnnotArg(value map (x => apply(ScalaRunTime.arrayElementClass(clazz) -> x)))
+        case (AnnotationClass(), value: jAnnotation) => NestedAnnotArg(JavaAnnotationProxy(value))
+        case _                                       => UnmappableAnnotArg
+      }
+    }
+    private case class JavaAnnotationProxy(jann: jAnnotation) extends AnnotationInfo {
+      override val atp: Type = classToScala(jann.annotationType).toType
+      override val args: List[Tree] = Nil
+      override def original: Tree = EmptyTree
+      override def setOriginal(t: Tree): this.type = throw new Exception("setOriginal inapplicable for " + this)
+      override def pos: Position = NoPosition
+      override def setPos(pos: Position): this.type = throw new Exception("setPos inapplicable for " + this)
+      override def toString = completeAnnotationToString(this)
+
+      // todo. find out the exact order of assocs as they are written in the class file
+      // currently I'm simply sorting the methods to guarantee stability of the output
+      override lazy val assocs: List[(Name, ClassfileAnnotArg)] = (
+        jann.annotationType.getDeclaredMethods.sortBy(_.getName).toList map (m =>
+          (m.getName: TermName) -> toAnnotArg(m.getReturnType -> m.invoke(jann))
+        )
+      )
+    }
+
     def reflect[T: ClassTag](obj: T): InstanceMirror = new JavaInstanceMirror(obj)
 
     def reflectClass(cls: ClassSymbol): ClassMirror = {
@@ -574,35 +621,6 @@ trait JavaMirrors extends internal.SymbolTable with api.JavaUniverse { self: Sym
      *  Note: If `sym` is a method or constructor, its parameter annotations are copied as well.
      */
     private def copyAnnotations(sym: Symbol, jann: AnnotatedElement) {
-      case class JavaAnnotationProxy(jann: jAnnotation) extends AnnotationInfo {
-        override val atp: Type = classToScala(jann.annotationType).toType
-        override val args: List[Tree] = Nil
-        override def original: Tree = EmptyTree
-        override def setOriginal(t: Tree): this.type = throw new Exception("setOriginal inapplicable for " + this)
-        override def pos: Position = NoPosition
-        override def setPos(pos: Position): this.type = throw new Exception("setPos inapplicable for " + this)
-        override def toString = completeAnnotationToString(this)
-        override def assocs: List[(Name, ClassfileAnnotArg)] =
-          // todo. find out the exact order of assocs as they are written in the class file
-          // currently I'm simply sorting the methods to guarantee stability of the output
-          jann.annotationType.getDeclaredMethods.sortBy(_.getName).toList map (m => {
-            def enumToSymbol(enum: Enum[_]): Symbol =
-              classToScala(enum.getClass).typeSignature.declaration(newTermName(enum.name))
-
-            def toAnnotArg(value: Any, schema: jClass[_]): ClassfileAnnotArg = schema match {
-              case primitive if primitive.isPrimitive => LiteralAnnotArg(Constant(value))
-              case string if string == classOf[String] => LiteralAnnotArg(Constant(value))
-              case clazz if clazz == classOf[jClass[_]] => LiteralAnnotArg(Constant(classToScala(value.asInstanceOf[jClass[_]]).toType))
-              case enum if enum.isEnum => LiteralAnnotArg(Constant(enumToSymbol(value.asInstanceOf[Enum[_]])))
-              case array if array.isArray => ArrayAnnotArg(value.asInstanceOf[Array[_]] map (x => toAnnotArg(x, ScalaRunTime.arrayElementClass(array))))
-              case ann if ann.isAnnotation => NestedAnnotArg(JavaAnnotationProxy(value.asInstanceOf[jAnnotation]))
-              case _ => UnmappableAnnotArg
-            }
-
-            newTermName(m.getName) -> toAnnotArg(m.invoke(jann), m.getReturnType)
-          })
-      }
-
       sym setAnnotations (jann.getAnnotations map JavaAnnotationProxy).toList
     }