Rename meta -> quoted

Author: odersky

compiler/src/dotty/tools/dotc/core/Definitions.scala

@@ -5,7 +5,6 @@ package core
 import Types._, Contexts._, Symbols._, Denotations._, SymDenotations._, StdNames._, Names._
 import Flags._, Scopes._, Decorators._, NameOps._, util.Positions._, Periods._
 import unpickleScala2.Scala2Unpickler.ensureConstructor
-import scala.annotation.{ switch, meta }
 import scala.collection.{ mutable, immutable }
 import PartialFunction._
 import collection.mutable
@@ -299,11 +298,11 @@ class Definitions {
 
   /** Method representing a term quote */
   lazy val quoteMethod = enterPolyMethod(OpsPackageClass, nme.QUOTE, 1,
-      pt => MethodType(pt.paramRefs(0) :: Nil, MetaExprType.appliedTo(pt.paramRefs(0) :: Nil)))
+      pt => MethodType(pt.paramRefs(0) :: Nil, QuotedExprType.appliedTo(pt.paramRefs(0) :: Nil)))
 
   /** Method representing a type quote */
   lazy val typeQuoteMethod = enterPolyMethod(OpsPackageClass, nme.QUOTE, 1,
-      pt => MetaTypeType.appliedTo(pt.paramRefs(0) :: Nil))
+      pt => QuotedTypeType.appliedTo(pt.paramRefs(0) :: Nil))
 
   lazy val NothingClass: ClassSymbol = enterCompleteClassSymbol(
     ScalaPackageClass, tpnme.Nothing, AbstractFinal, List(AnyClass.typeRef))
@@ -591,22 +590,22 @@ class Definitions {
   def ClassTagClass(implicit ctx: Context) = ClassTagType.symbol.asClass
   def ClassTagModule(implicit ctx: Context) = ClassTagClass.companionModule
 
-  lazy val MetaQuotedType = ctx.requiredClassRef("scala.meta.Quoted")
-  def MetaQuotedClass(implicit ctx: Context) = MetaQuotedType.symbol.asClass
+  lazy val QuotedType = ctx.requiredClassRef("scala.quoted.Quoted")
+  def QuotedClass(implicit ctx: Context) = QuotedType.symbol.asClass
 
-  lazy val MetaExprType = ctx.requiredClassRef("scala.meta.Expr")
-  def MetaExprClass(implicit ctx: Context) = MetaExprType.symbol.asClass
+  lazy val QuotedExprType = ctx.requiredClassRef("scala.quoted.Expr")
+  def QuotedExprClass(implicit ctx: Context) = QuotedExprType.symbol.asClass
 
-    def MetaExpr_~(implicit ctx: Context) = MetaExprClass.requiredMethod(nme.UNARY_~)
+    def QuotedExpr_~(implicit ctx: Context) = QuotedExprClass.requiredMethod(nme.UNARY_~)
 
-  lazy val MetaTypeType = ctx.requiredClassRef("scala.meta.Type")
-  def MetaTypeClass(implicit ctx: Context) = MetaTypeType.symbol.asClass
+  lazy val QuotedTypeType = ctx.requiredClassRef("scala.quoted.Type")
+  def QuotedTypeClass(implicit ctx: Context) = QuotedTypeType.symbol.asClass
 
-    def MetaType_~(implicit ctx: Context) =
-      MetaTypeClass.info.member(tpnme.UNARY_~).symbol.asType
+    def QuotedType_~(implicit ctx: Context) =
+      QuotedTypeClass.info.member(tpnme.UNARY_~).symbol.asType
 
-  def Unpickler_unpickleExpr = ctx.requiredMethod("scala.meta.Unpickler.unpickleExpr")
-  def Unpickler_unpickleType = ctx.requiredMethod("scala.meta.Unpickler.unpickleType")
+  def Unpickler_unpickleExpr = ctx.requiredMethod("scala.quoted.Unpickler.unpickleExpr")
+  def Unpickler_unpickleType = ctx.requiredMethod("scala.quoted.Unpickler.unpickleType")
 
   lazy val EqType = ctx.requiredClassRef("scala.Eq")
   def EqClass(implicit ctx: Context) = EqType.symbol.asClass

compiler/src/dotty/tools/dotc/transform/ReifyQuotes.scala

@@ -25,7 +25,7 @@ class ReifyQuotes extends MacroTransform {
    *
    *      Select(qual, sym)
    *
-   *  where `sym` is either `defn.MetaExpr_~` or `defn.MetaType_~`. For any splice,
+   *  where `sym` is either `defn.QuotedExpr_~` or `defn.QuotedType_~`. For any splice,
    *  the `qual` part should not be pickled, since it will be added separately later
    *  as a splice.
    */
@@ -76,8 +76,8 @@ class ReifyQuotes extends MacroTransform {
         else check(sym, _.show)
     }
 
-    /** Turn `body` of quote into a call of `scala.meta.Unpickler.unpickleType` or
-     *  `scala.meta.Unpickler.unpickleExpr` depending onwhether `isType` is true or not.
+    /** Turn `body` of quote into a call of `scala.quoted.Unpickler.unpickleType` or
+     *  `scala.quoted.Unpickler.unpickleExpr` depending onwhether `isType` is true or not.
      *  The arguments to the method are:
      *
      *    - the serialized `body`, as returned from `pickleTree`
@@ -88,7 +88,7 @@ class ReifyQuotes extends MacroTransform {
         .appliedToType(if (isType) body.tpe else body.tpe.widen)
         .appliedTo(
           Literal(Constant(pickleTree(body, isType))),
-          SeqLiteral(splicesAtLevel(currentLevel).toList, TypeTree(defn.MetaQuotedType)))
+          SeqLiteral(splicesAtLevel(currentLevel).toList, TypeTree(defn.QuotedType)))
 
     /** Perform operation `op` in quoted context */
     private def inQuote(op: => Tree)(implicit ctx: Context) = {
@@ -109,7 +109,7 @@ class ReifyQuotes extends MacroTransform {
       case TypeApply(fn, arg :: Nil) if fn.symbol == defn.typeQuoteMethod =>
         inQuote(reifyCall(transform(arg), isType = true))
       case Select(body, name)
-      if tree.symbol == defn.MetaExpr_~ || tree.symbol == defn.MetaType_~ =>
+      if tree.symbol == defn.QuotedExpr_~ || tree.symbol == defn.QuotedType_~ =>
         currentLevel -= 1
         val body1 = try transform(body) finally currentLevel += 1
         if (currentLevel > 0) {

compiler/src/dotty/tools/dotc/typer/Typer.scala

@@ -1076,7 +1076,7 @@ class Typer extends Namer with TypeAssigner with Applications with Implicits wit
     ctx.compilationUnit.containsQuotes = true
     val untpd.Quote(body) = tree
     val isType = body.isType
-    val resultClass = if (isType) defn.MetaTypeClass else defn.MetaExprClass
+    val resultClass = if (isType) defn.QuotedTypeClass else defn.QuotedExprClass
     val proto1 = pt.baseType(resultClass) match {
       case AppliedType(_, argType :: Nil) => argType
       case _ => WildcardType

library/src/scala/meta/Expr.scala renamed to library/src/scala/quoted/Expr.scala

@@ -1,5 +1,6 @@
-package scala.meta
+package scala.quoted
 
 class Expr[T] extends Quoted {
   def unary_~ : T = ???
+  def run: T = ???
 }

library/src/scala/meta/Quoted.scala renamed to library/src/scala/quoted/Quoted.scala

@@ -1,4 +1,4 @@
-package scala.meta
+package scala.quoted
 
 /** Common superclass of Expr and Type */
 class Quoted

library/src/scala/meta/Type.scala renamed to library/src/scala/quoted/Type.scala

@@ -1,5 +1,6 @@
-package scala.meta
+package scala.quoted
 
 class Type[T] extends Quoted {
   type unary_~ = T
 }
+

library/src/scala/meta/Unpickler.scala renamed to library/src/scala/quoted/Unpickler.scala

@@ -1,4 +1,4 @@
-package scala.meta
+package scala.quoted
 
 /** Provides methods to unpickle `Expr` and `Type` trees. */
 object Unpickler {

tests/neg/quoteTest.scala

@@ -0,0 +1,16 @@
+import scala.quoted._
+
+class Test {
+
+  val x: Int = 0
+
+  '{ '(x + 1)  // error: wrong staging level
+
+    '((y: Expr[Int]) => ~y )  // error: wrong staging level
+
+  }
+
+  '(x + 1)  // error: wrong staging level
+
+  '((y: Expr[Int]) => ~y )  // error: wrong staging level
+}

tests/pos/quoteTest.scala

@@ -1,8 +1,8 @@
-import scala.meta._
+import scala.quoted._
 
 object Test {
 
-  def f[T](t: Type[T], x: Expr[T]) = {
+  def f[T](t: Type[T], x: Expr[T]) = '{
     val y: t.unary_~ = x.unary_~
     val z: ~t = ~x
   }