brings reification up to speed

Along with recovering from reflection refactoring, I implemented
some new features (e.g. rollback of macro expansions),
and did some stabilizing refactorings (e.g. moved mutable state into a ghetto).

Also used the refactoring as a chance to fix free and aux symbols.
Encapsulated this notion in a symbol table class, which allowed me
to address outstanding issues with symbol table inheritance and inlining.

1 files changed, 14 insertions, 1 deletions

diff --git a/src/compiler/scala/reflect/runtime/package.scala b/src/compiler/scala/reflect/runtime/package.scala
index 531873c661..a5809a2629 100644
--- a/src/compiler/scala/reflect/runtime/package.scala
+++ b/src/compiler/scala/reflect/runtime/package.scala
@@ -9,5 +9,18 @@ package object runtime {
 
   // [Eugene++ to Martin] removed `mirrorOfLoader`, because one can use `universe.runtimeMirror` instead
 
-  def currentMirror: universe.Mirror = ???
+  def currentMirror: universe.Mirror = macro Macros.currentMirror
+}
+
+package runtime {
+  object Macros {
+    def currentMirror(c: scala.reflect.makro.Context): c.Expr[universe.Mirror] = {
+      import c.universe._
+      val runtimeClass = c.reifyEnclosingRuntimeClass
+      if (runtimeClass.isEmpty) c.abort(c.enclosingPosition, "call site does not have an enclosing class")
+      val runtimeUniverse = Select(Select(Select(Ident(newTermName("scala")), newTermName("reflect")), newTermName("runtime")), newTermName("universe"))
+      val currentMirror = Apply(Select(runtimeUniverse, newTermName("runtimeMirror")), List(Select(runtimeClass, newTermName("getClassLoader"))))
+      c.Expr[Nothing](currentMirror)(c.TypeTag.Nothing)
+    }
+  }
 }