Merge pull request scala#804 from scalamacros/topic/reflectglobal

moves reflective compiler into scala.tools.reflect

Author: Adriaan Moors

src/compiler/scala/tools/nsc/ReflectGlobal.scala renamed to src/compiler/scala/tools/reflect/ReflectGlobal.scala

@@ -1,12 +1,15 @@
-package scala.tools.nsc
+package scala.tools
+package reflect
 
-import reporters.Reporter
+import scala.tools.nsc.Global
+import scala.tools.nsc.reporters.Reporter
+import scala.tools.nsc.Settings
 
 /** A version of Global that uses reflection to get class
  *  infos, instead of reading class or source files.
  */
 class ReflectGlobal(currentSettings: Settings, reporter: Reporter, override val rootClassLoader: ClassLoader)
-  extends Global(currentSettings, reporter) with scala.tools.nsc.ReflectSetup with scala.reflect.runtime.SymbolTable {
+  extends Global(currentSettings, reporter) with scala.tools.reflect.ReflectSetup with scala.reflect.runtime.SymbolTable {
 
   override def transformedType(sym: Symbol) =
     erasure.transformInfo(sym,

src/compiler/scala/tools/nsc/ReflectMain.scala renamed to src/compiler/scala/tools/reflect/ReflectMain.scala

@@ -1,8 +1,12 @@
-package scala.tools.nsc
+package scala.tools
+package reflect
 
-import tools.util.PathResolver
-import util.ClassPath.DefaultJavaContext
-import util.ScalaClassLoader
+import scala.tools.nsc.Driver
+import scala.tools.nsc.Global
+import scala.tools.nsc.Settings
+import scala.tools.nsc.util.ClassPath.DefaultJavaContext
+import scala.tools.nsc.util.ScalaClassLoader
+import scala.tools.util.PathResolver
 
 object ReflectMain extends Driver {
 

src/compiler/scala/tools/nsc/ReflectSetup.scala renamed to src/compiler/scala/tools/reflect/ReflectSetup.scala

@@ -1,7 +1,10 @@
-package scala.tools.nsc
+package scala.tools
+package reflect
+
+import scala.tools.nsc.Global
 
 /** A helper trait to initialize things that need to be set before JavaMirrors and other
  *  reflect specific traits are initialized */
-private[nsc] trait ReflectSetup { this: Global =>
+private[reflect] trait ReflectSetup { this: Global =>
   phase = new Run().typerPhase
 }

src/compiler/scala/tools/reflect/ToolBoxFactory.scala

@@ -2,7 +2,6 @@ package scala.tools
 package reflect
 
 import scala.tools.nsc.reporters._
-import scala.tools.nsc.ReflectGlobal
 import scala.tools.nsc.CompilerCommand
 import scala.tools.nsc.Global
 import scala.tools.nsc.typechecker.Modes

src/reflect/scala/reflect/runtime/SymbolTable.scala

@@ -4,7 +4,7 @@ package runtime
 /**
  *  This symbol table trait fills in the definitions so that class information is obtained by refection.
  *  It can be used either from a reflexive universe (class scala.reflect.runtime.JavaUniverse), or else from
- *  a runtime compiler that uses reflection to get a class information (class scala.tools.nsc.ReflectGlobal)
+ *  a runtime compiler that uses reflection to get a class information (class scala.tools.reflect.ReflectGlobal)
  */
 trait SymbolTable extends internal.SymbolTable with JavaMirrors with SymbolLoaders with SynchronizedOps {