Linked Manifests up with Reflection.

2 files changed, 34 insertions, 7 deletions

diff --git a/src/compiler/scala/reflect/runtime/Mirror.scala b/src/compiler/scala/reflect/runtime/Mirror.scala
index b1724d6450..d2f043c2e2 100644
--- a/src/compiler/scala/reflect/runtime/Mirror.scala
+++ b/src/compiler/scala/reflect/runtime/Mirror.scala
@@ -6,7 +6,7 @@ import java.lang.reflect.Array
 
 /** The mirror for standard runtime reflection from Java.
  */
-class Mirror extends Universe with api.Mirror {
+class Mirror extends Universe with RuntimeTypes with api.Mirror {
 
   import definitions._
 
@@ -33,12 +33,8 @@ class Mirror extends Universe with api.Mirror {
     methodToJava(meth).invoke(receiver, args.asInstanceOf[Seq[AnyRef]]: _*)
   }
 
-  def freeValue(x: Any): Tree = FreeValue(x)
-
-  // to do: replace with generalized
-  // case class Literal(x: Any),
-  // once calls to the deprecated factory Literal(x: Any) has been eliminated from all code.
-  case class FreeValue(any: Any) extends Tree
+  override def classToType(jclazz: java.lang.Class[_]): Type = typeToScala(jclazz)
+  override def classToSymbol(jclazz: java.lang.Class[_]): Symbol = classToScala(jclazz)
 
 }
 
diff --git a/src/compiler/scala/reflect/runtime/RuntimeTypes.scala b/src/compiler/scala/reflect/runtime/RuntimeTypes.scala
new file mode 100644
index 0000000000..818596d7b3
--- /dev/null
+++ b/src/compiler/scala/reflect/runtime/RuntimeTypes.scala
@@ -0,0 +1,31 @@
+package scala.reflect
+package runtime
+
+import collection.mutable.ListBuffer
+
+trait RuntimeTypes extends Universe with api.RuntimeTypes {
+
+  def freeValue(x: Any): Tree = FreeValue(x)
+
+  // to do: replace with generalized
+  // case class Literal(x: Any),
+  // once calls to the deprecated factory Literal(x: Any) has been eliminated from all code.
+  case class FreeValue(any: Any) extends Tree
+
+  case class InstanceRefSymbol(value: AnyRef) extends TermSymbol(NoSymbol, NoPosition, nme.EMPTY)
+  object InstanceRefSymbol extends InstanceRefSymbolExtractor
+
+  override private[reflect] def namedType(pre: Type, sym: Symbol, args: List[Type]): Type = {
+    val tparamBuf = new ListBuffer[Symbol]
+    val args1 = for (arg <- args) yield arg match {
+      case _: TypeBounds =>
+        val ex = pre.typeSymbol.freshExistential("$ex") setInfo arg
+        tparamBuf += ex
+        TypeRef(NoPrefix, ex, List())
+      case _ =>
+        arg
+    }
+    existentialAbstraction(tparamBuf.toList, typeRef(pre, sym, args1))
+  }
+
+}
\ No newline at end of file