reflect.makro => reflect.macros (Step I)

Builds a starr that uses stuff from scala.reflect.macros for macro activities.
Crucial makro thingies (such as makro.Context or makro.internal.macroImpl)
are temporarily left in place, because they are necessary for previous starr.

Macro tests will be fixed in a dedicated commit, so that they don't pollute
meaningful commits, making the life easy for reviewers and spelunkers.

23 files changed, 32 insertions, 27 deletions

diff --git a/src/reflect/scala/reflect/internal/Definitions.scala b/src/reflect/scala/reflect/internal/Definitions.scala
index 7248fac5fb..0fd86cdb3a 100644
--- a/src/reflect/scala/reflect/internal/Definitions.scala
+++ b/src/reflect/scala/reflect/internal/Definitions.scala
@@ -495,13 +495,13 @@ trait Definitions extends api.StandardDefinitions {
     lazy val TypeCreatorClass      = requiredClass[scala.reflect.base.TypeCreator]
     lazy val TreeCreatorClass      = requiredClass[scala.reflect.base.TreeCreator]
 
-    lazy val MacroContextClass                   = getClassIfDefined("scala.reflect.makro.Context") // defined in scala-reflect.jar, so we need to be careful
+    lazy val MacroContextClass                   = getClassIfDefined("scala.reflect.macros.Context") // defined in scala-reflect.jar, so we need to be careful
          def MacroContextPrefix                  = if (MacroContextClass != NoSymbol) getMemberMethod(MacroContextClass, nme.prefix) else NoSymbol
          def MacroContextPrefixType              = if (MacroContextClass != NoSymbol) getMemberType(MacroContextClass, tpnme.PrefixType) else NoSymbol
          def MacroContextUniverse                = if (MacroContextClass != NoSymbol) getMemberMethod(MacroContextClass, nme.universe) else NoSymbol
          def MacroContextMirror                  = if (MacroContextClass != NoSymbol) getMemberMethod(MacroContextClass, nme.mirror) else NoSymbol
-    lazy val MacroImplAnnotation                 = requiredClass[scala.reflect.makro.internal.macroImpl]
-    lazy val MacroInternalPackage                = getPackageObject("scala.reflect.makro.internal")
+    lazy val MacroImplAnnotation                 = requiredClass[scala.reflect.macros.internal.macroImpl]
+    lazy val MacroInternalPackage                = getPackageObject("scala.reflect.macros.internal")
          def MacroInternal_materializeClassTag   = getMemberMethod(MacroInternalPackage, nme.materializeClassTag)
          def MacroInternal_materializeAbsTypeTag = getMemberMethod(MacroInternalPackage, nme.materializeAbsTypeTag)
          def MacroInternal_materializeTypeTag    = getMemberMethod(MacroInternalPackage, nme.materializeTypeTag)
diff --git a/src/reflect/scala/reflect/internal/SymbolTable.scala b/src/reflect/scala/reflect/internal/SymbolTable.scala
index 5ae8f22c64..dfb434300d 100644
--- a/src/reflect/scala/reflect/internal/SymbolTable.scala
+++ b/src/reflect/scala/reflect/internal/SymbolTable.scala
@@ -9,7 +9,7 @@ package internal
 import scala.collection.{ mutable, immutable }
 import util._
 
-abstract class SymbolTable extends makro.Universe
+abstract class SymbolTable extends macros.Universe
                               with Collections
                               with Names
                               with Symbols
diff --git a/src/reflect/scala/reflect/internal/TreeGen.scala b/src/reflect/scala/reflect/internal/TreeGen.scala
index 285700f9ff..d160695e67 100644
--- a/src/reflect/scala/reflect/internal/TreeGen.scala
+++ b/src/reflect/scala/reflect/internal/TreeGen.scala
@@ -1,7 +1,7 @@
 package scala.reflect
 package internal
 
-abstract class TreeGen extends makro.TreeBuilder {
+abstract class TreeGen extends macros.TreeBuilder {
   val global: SymbolTable
 
   import global._
diff --git a/src/reflect/scala/reflect/makro/Aliases.scala b/src/reflect/scala/reflect/macros/Aliases.scala
index 4bd246572f..46b7066902 100644
--- a/src/reflect/scala/reflect/makro/Aliases.scala
+++ b/src/reflect/scala/reflect/macros/Aliases.scala
@@ -1,5 +1,5 @@
 package scala.reflect
-package makro
+package macros
 
 trait Aliases {
   self: Context =>
diff --git a/src/reflect/scala/reflect/makro/CapturedVariables.scala b/src/reflect/scala/reflect/macros/CapturedVariables.scala
index 592e28b3b2..60ed6f5e7b 100644
--- a/src/reflect/scala/reflect/makro/CapturedVariables.scala
+++ b/src/reflect/scala/reflect/macros/CapturedVariables.scala
@@ -1,5 +1,5 @@
 package scala.reflect
-package makro
+package macros
 
 trait CapturedVariables {
   self: Context =>
diff --git a/src/reflect/scala/reflect/makro/Context.scala b/src/reflect/scala/reflect/macros/Context.scala
index f3b1271a57..37c8f9057e 100644
--- a/src/reflect/scala/reflect/makro/Context.scala
+++ b/src/reflect/scala/reflect/macros/Context.scala
@@ -1,9 +1,9 @@
 package scala.reflect
-package makro
+package macros
 
 // todo. introduce context hierarchy
 // the most lightweight context should just expose the stuff from the SIP
-// the full context should include all traits from scala.reflect.makro (and probably reside in scala-compiler.jar)
+// the full context should include all traits from scala.reflect.macros (and probably reside in scala-compiler.jar)
 
 trait Context extends Aliases
                  with CapturedVariables
diff --git a/src/reflect/scala/reflect/makro/Enclosures.scala b/src/reflect/scala/reflect/macros/Enclosures.scala
index ff5c13a785..a07ff85a08 100644
--- a/src/reflect/scala/reflect/makro/Enclosures.scala
+++ b/src/reflect/scala/reflect/macros/Enclosures.scala
@@ -1,5 +1,5 @@
 package scala.reflect
-package makro
+package macros
 
 trait Enclosures {
   self: Context =>
diff --git a/src/reflect/scala/reflect/makro/Evals.scala b/src/reflect/scala/reflect/macros/Evals.scala
index 4e5fc2f97f..3837d749da 100644
--- a/src/reflect/scala/reflect/makro/Evals.scala
+++ b/src/reflect/scala/reflect/macros/Evals.scala
@@ -1,5 +1,5 @@
 package scala.reflect
-package makro
+package macros
 
 trait Evals {
   self: Context =>
diff --git a/src/reflect/scala/reflect/makro/ExprUtils.scala b/src/reflect/scala/reflect/macros/ExprUtils.scala
index c3e5cc6bc1..adcdc78c78 100644
--- a/src/reflect/scala/reflect/makro/ExprUtils.scala
+++ b/src/reflect/scala/reflect/macros/ExprUtils.scala
@@ -1,5 +1,5 @@
 package scala.reflect
-package makro
+package macros
 
 trait ExprUtils {
   self: Context =>
diff --git a/src/reflect/scala/reflect/makro/Exprs.scala b/src/reflect/scala/reflect/macros/Exprs.scala
index 91d3dafbf2..ceaab06d12 100644
--- a/src/reflect/scala/reflect/makro/Exprs.scala
+++ b/src/reflect/scala/reflect/macros/Exprs.scala
@@ -1,5 +1,5 @@
 package scala.reflect
-package makro
+package macros
 
 trait Exprs {
   self: Context =>
diff --git a/src/reflect/scala/reflect/makro/FrontEnds.scala b/src/reflect/scala/reflect/macros/FrontEnds.scala
index 5087f90174..d15db0725f 100644
--- a/src/reflect/scala/reflect/makro/FrontEnds.scala
+++ b/src/reflect/scala/reflect/macros/FrontEnds.scala
@@ -1,5 +1,5 @@
 package scala.reflect
-package makro
+package macros
 
 trait FrontEnds extends scala.reflect.api.FrontEnds {
   self: Context =>
diff --git a/src/reflect/scala/reflect/makro/Infrastructure.scala b/src/reflect/scala/reflect/macros/Infrastructure.scala
index e6bfe33366..1f1bd160a1 100644
--- a/src/reflect/scala/reflect/makro/Infrastructure.scala
+++ b/src/reflect/scala/reflect/macros/Infrastructure.scala
@@ -1,5 +1,5 @@
 package scala.reflect
-package makro
+package macros
 
 trait Infrastructure {
   self: Context =>
diff --git a/src/reflect/scala/reflect/makro/Names.scala b/src/reflect/scala/reflect/macros/Names.scala
index 909976d83c..fab9bbbca5 100644
--- a/src/reflect/scala/reflect/makro/Names.scala
+++ b/src/reflect/scala/reflect/macros/Names.scala
@@ -1,5 +1,5 @@
 package scala.reflect
-package makro
+package macros
 
 trait Names {
   self: Context =>
diff --git a/src/reflect/scala/reflect/makro/Parsers.scala b/src/reflect/scala/reflect/macros/Parsers.scala
index 9866b7e491..ea87c5842e 100644
--- a/src/reflect/scala/reflect/makro/Parsers.scala
+++ b/src/reflect/scala/reflect/macros/Parsers.scala
@@ -1,5 +1,5 @@
 package scala.reflect
-package makro
+package macros
 
 trait Parsers {
   self: Context =>
diff --git a/src/reflect/scala/reflect/makro/Reifiers.scala b/src/reflect/scala/reflect/macros/Reifiers.scala
index f39f56f935..1bee17d548 100644
--- a/src/reflect/scala/reflect/makro/Reifiers.scala
+++ b/src/reflect/scala/reflect/macros/Reifiers.scala
@@ -1,5 +1,5 @@
 package scala.reflect
-package makro
+package macros
 
 trait Reifiers {
   self: Context =>
diff --git a/src/reflect/scala/reflect/makro/Settings.scala b/src/reflect/scala/reflect/macros/Settings.scala
index c6c7e5870b..8d166056c3 100644
--- a/src/reflect/scala/reflect/makro/Settings.scala
+++ b/src/reflect/scala/reflect/macros/Settings.scala
@@ -1,5 +1,5 @@
 package scala.reflect
-package makro
+package macros
 
 trait Settings {
   self: Context =>
diff --git a/src/reflect/scala/reflect/makro/TreeBuilder.scala b/src/reflect/scala/reflect/macros/TreeBuilder.scala
index c4179b9c80..06f5caf68b 100644
--- a/src/reflect/scala/reflect/makro/TreeBuilder.scala
+++ b/src/reflect/scala/reflect/macros/TreeBuilder.scala
@@ -1,5 +1,5 @@
 package scala.reflect
-package makro
+package macros
 
 // [Eugene] I added some stuff that was necessary for typetag materialization macros
 // but we should think it over and pick other generally useful stuff
diff --git a/src/reflect/scala/reflect/makro/TypeTags.scala b/src/reflect/scala/reflect/macros/TypeTags.scala
index 53a9b116e3..8f590d1de4 100644
--- a/src/reflect/scala/reflect/makro/TypeTags.scala
+++ b/src/reflect/scala/reflect/macros/TypeTags.scala
@@ -1,5 +1,5 @@
 package scala.reflect
-package makro
+package macros
 
 trait TypeTags {
   self: Context =>
diff --git a/src/reflect/scala/reflect/makro/Typers.scala b/src/reflect/scala/reflect/macros/Typers.scala
index 4176c184d0..eef6507418 100644
--- a/src/reflect/scala/reflect/makro/Typers.scala
+++ b/src/reflect/scala/reflect/macros/Typers.scala
@@ -1,5 +1,5 @@
 package scala.reflect
-package makro
+package macros
 
 trait Typers {
   self: Context =>
diff --git a/src/reflect/scala/reflect/makro/Universe.scala b/src/reflect/scala/reflect/macros/Universe.scala
index d88e7e0bb8..4074dd9e93 100644
--- a/src/reflect/scala/reflect/makro/Universe.scala
+++ b/src/reflect/scala/reflect/macros/Universe.scala
@@ -1,5 +1,5 @@
 package scala.reflect
-package makro
+package macros
 
 abstract class Universe extends scala.reflect.api.Universe {
 
diff --git a/src/reflect/scala/reflect/macros/package.scala b/src/reflect/scala/reflect/macros/package.scala
new file mode 100644
index 0000000000..06ce0b3244
--- /dev/null
+++ b/src/reflect/scala/reflect/macros/package.scala
@@ -0,0 +1,6 @@
+package scala.reflect
+
+package object macros {
+
+  type MirrorOf[U <: base.Universe with Singleton] = base.MirrorOf[U]
+}
diff --git a/src/reflect/scala/reflect/makro/package.scala b/src/reflect/scala/reflect/makro/package.scala
index 3c0e51030e..f5868eab18 100644
--- a/src/reflect/scala/reflect/makro/package.scala
+++ b/src/reflect/scala/reflect/makro/package.scala
@@ -1,6 +1,5 @@
 package scala.reflect
 
 package object makro {
-
-  type MirrorOf[U <: base.Universe with Singleton] = base.MirrorOf[U]
-}
+  type Context = scala.reflect.macros.Context
+}
\ No newline at end of file
diff --git a/src/reflect/scala/reflect/runtime/package.scala b/src/reflect/scala/reflect/runtime/package.scala
index 2d48b9a5bf..2cb72d3824 100644
--- a/src/reflect/scala/reflect/runtime/package.scala
+++ b/src/reflect/scala/reflect/runtime/package.scala
@@ -13,7 +13,7 @@ package object runtime {
 
 package runtime {
   object Macros {
-    def currentMirror(c: scala.reflect.makro.Context): c.Expr[universe.Mirror] = {
+    def currentMirror(c: scala.reflect.macros.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")