Merge pull request scala#1324 from scalamacros/ticket/6374

Scala reflection now supports Java CRTP

Author: xeno-by

src/reflect/scala/reflect/runtime/JavaMirrors.scala

@@ -148,8 +148,10 @@ trait JavaMirrors extends internal.SymbolTable with api.JavaUniverse { thisUnive
       object AnnotationClass { def unapply(x: jClass[_]) = x.isAnnotation }
 
       object ConstantArg {
-        def enumToSymbol(enum: Enum[_]): Symbol =
-          classToScala(enum.getClass).typeSignature.declaration(enum.name: TermName)
+        def enumToSymbol(enum: Enum[_]): Symbol = {
+          val staticPartOfEnum = classToScala(enum.getClass).companionSymbol
+          staticPartOfEnum.typeSignature.declaration(enum.name: TermName)
+        }
 
         def unapply(schemaAndValue: (jClass[_], Any)): Option[Any] = schemaAndValue match {
           case (StringClass | PrimitiveClass(), value) => Some(value)
@@ -659,7 +661,6 @@ trait JavaMirrors extends internal.SymbolTable with api.JavaUniverse { thisUnive
       }
 
       override def complete(sym: Symbol): Unit = {
-        if (jclazz.isEnum) throw new ScalaReflectionException("implementation restriction: Java enums are not supported")
         load(sym)
         completeRest()
       }
@@ -1024,13 +1025,12 @@ trait JavaMirrors extends internal.SymbolTable with api.JavaUniverse { thisUnive
           rawToExistential(typeRef(clazz.owner.thisType, clazz, List()))
         }
       case japplied: ParameterizedType =>
-        val (pre, sym) = typeToScala(japplied.getRawType) match {
-          case ExistentialType(tparams, TypeRef(pre, sym, _)) => (pre, sym)
-          case TypeRef(pre, sym, _)                           => (pre, sym)
-        }
+        // http://stackoverflow.com/questions/5767122/parameterizedtype-getrawtype-returns-j-l-r-type-not-class
+        val sym = classToScala(japplied.getRawType.asInstanceOf[jClass[_]])
+        val pre = sym.owner.thisType
         val args0 = japplied.getActualTypeArguments
         val (args, bounds) = targsToScala(pre.typeSymbol, args0.toList)
-        ExistentialType(bounds, typeRef(pre, sym, args))
+        newExistentialType(bounds, typeRef(pre, sym, args))
       case jarr: GenericArrayType =>
         arrayType(typeToScala(jarr.getGenericComponentType))
       case jtvar: jTypeVariable[_] =>

test/files/lib/javac-artifacts.jar.desired.sha1

@@ -0,0 +1 @@
+c5788c5e518eb267445c5a995fd98b2210f90a58 ?javac-artifacts.jar

test/files/run/reflection-java-annotations.check

@@ -1,22 +1 @@
-Type in expressions to have them evaluated.
-Type :help for more information.
-
-scala> 
-
-scala>     import scala.reflect.runtime.universe._
-import scala.reflect.runtime.universe._
-
-scala>     val sym = typeOf[Foo].typeSymbol
-sym: reflect.runtime.universe.Symbol = class Foo
-
-scala>     sym.typeSignature
-res0: reflect.runtime.universe.Type = java.lang.Object{def <init>(): Foo}
-
-scala>     sym.getAnnotations foreach (_.javaArgs)
-
-scala>     println(sym.getAnnotations)
-List(ComplexAnnotation(v1 = 1, v10 = "hello", v101 = [101, 101], v102 = [102, 102], v103 = ['g', 'g'], v104 = [104, 104], v105 = [105L, 105L], v106 = [106.0, 106.0], v107 = [107.0, 107.0], v108 = [false, true], v11 = classOf[Foo], v110 = ["hello", "world"], v111 = [classOf[SimpleAnnotation], classOf[ComplexAnnotation]], v113 = [SimpleAnnotation(v1 = 21, v10 = "world2", v11 = classOf[ComplexAnnotation], v2 = 22, v3 = '\027', v4 = 24, v5 = 25L, v6 = 26.0, v7 = 27.0, v8 = false)], v13 = SimpleAnnotation(v1 = 11, v10 = "world1", v11 = classOf[SimpleAnnotation], v2 = 12, v3 = '\r', v4 = 14, v5 = 15L, v6 = 16.0, v7 = 17.0, v8 = false), v2 = 2, v3 = '\03', v4 = 4, v5 = 5L, v6 = 6.0, v7 = 7.0, v8 = false))
-
-scala> 
-
-scala> 
+List(JavaComplexAnnotation(v1 = 1, v10 = "hello", v101 = [101, 101], v102 = [102, 102], v103 = ['g', 'g'], v104 = [104, 104], v105 = [105L, 105L], v106 = [106.0, 106.0], v107 = [107.0, 107.0], v108 = [false, true], v11 = classOf[JavaAnnottee], v110 = ["hello", "world"], v111 = [classOf[JavaSimpleAnnotation], classOf[JavaComplexAnnotation]], v112 = [FOO, BAR], v113 = [JavaSimpleAnnotation(v1 = 21, v10 = "world2", v11 = classOf[JavaComplexAnnotation], v12 = BAR, v2 = 22, v3 = '\027', v4 = 24, v5 = 25L, v6 = 26.0, v7 = 27.0, v8 = false)], v12 = FOO, v13 = JavaSimpleAnnotation(v1 = 11, v10 = "world1", v11 = classOf[JavaSimpleAnnotation], v12 = FOO, v2 = 12, v3 = '\r', v4 = 14, v5 = 15L, v6 = 16.0, v7 = 17.0, v8 = false), v2 = 2, v3 = '\03', v4 = 4, v5 = 5L, v6 = 6.0, v7 = 7.0, v8 = false))

test/files/run/reflection-java-annotations.jar.desired.sha1

@@ -1,20 +1,7 @@
-import scala.tools.partest._
-import scala.tools.nsc.Settings
-
-object Test extends ReplTest {
-  def code = """
-    import scala.reflect.runtime.universe._
-    val sym = typeOf[Foo].typeSymbol
-    sym.typeSignature
-    sym.getAnnotations foreach (_.javaArgs)
-    println(sym.getAnnotations)
-  """
-
-  override def transformSettings(settings: Settings): Settings = {
-    val thisFile = testPath.jfile.getAbsolutePath
-    val javaCompiledAnnotationsJar = (thisFile stripSuffix "scala") + "jar"
-    val classpath = List(sys.props("partest.lib"), sys.props("partest.reflect"), sys.props("partest.comp"), javaCompiledAnnotationsJar) mkString sys.props("path.separator")
-    settings.processArguments(List("-cp", classpath), true)
-    settings
-  }
+object Test extends App {
+  import scala.reflect.runtime.universe._
+  val sym = typeOf[JavaAnnottee].typeSymbol
+  sym.typeSignature
+  sym.getAnnotations foreach (_.javaArgs)
+  println(sym.getAnnotations)
 }

test/files/run/reflection-java-annotations.scala

@@ -0,0 +1 @@
+(type E,type E,true)

test/files/run/reflection-java-crtp.check

@@ -0,0 +1,8 @@
+object Test extends App {
+  import scala.reflect.runtime.universe._
+  val enum = typeOf[JavaSimpleEnumeration].baseClasses(1).asClass
+  // make sure that the E's in Enum<E extends Enum<E>> are represented by the same symbol
+  val e1 = enum.typeParams(0).asType
+  val TypeBounds(_, TypeRef(_, _, List(TypeRef(_, e2: TypeSymbol, _)))) = e1.typeSignature
+  println(e1, e2, e1 eq e2)
+}