wip

Author: nicolasstucki

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

@@ -175,14 +175,11 @@ class ReifyQuotes extends MacroTransform {
       }
 
       if (isType) {
-        // FIXME: suppot tag
-        // def tag(tagName: String) = ref(defn.QuotedTypeModule).select(tagName.toTermName)
-        // if (splices.isEmpty && body.symbol.isPrimitiveValueClass) tag(s"${body.symbol.name}Tag")
-        // else
-
-        quote match
-          case TypeApply(Select(Select(scope, _), _), _) => pickleAsTasty().select(nme.apply).appliedTo(scope)
-          case _ => pickleAsTasty() // FIXME remove this case
+        val TypeApply(Select(Select(scope, _), _), _) = quote
+        if splices.isEmpty && body.symbol.isPrimitiveValueClass then
+          scope.select("Type".toTermName).select(s"${body.symbol.name}Tag".toTermName)
+        else
+          pickleAsTasty().select(nme.apply).appliedTo(scope)
       }
       else getLiteral(body) match {
         // FIXME: support pickleAsLiteral

library/src-bootstrapped/scala/internal/quoted/Unpickler.scala

@@ -1,6 +1,6 @@
 package scala.internal.quoted
 
-import scala.quoted.{Expr, Scope, Type}
+import scala.quoted.{Expr, Scope}
 
 /** Provides methods to unpickle `Expr` and `Type` trees. */
 object Unpickler {

library/src-bootstrapped/scala/quoted/Scope.scala

@@ -125,6 +125,33 @@ trait Scope extends Liftables, Unliftables { self =>
   object Type:
     given apply[T <: AnyKind] as Type[T] = ???
 
+    def UnitTag: Type[Unit] =
+      tasty.defn.UnitType.seal.get.asInstanceOf[Type[Unit]]
+
+    def BooleanTag: Type[Boolean] =
+      tasty.defn.BooleanType.seal.get.asInstanceOf[Type[Boolean]]
+
+    def ByteTag: Type[Byte] =
+      tasty.defn.ByteType.seal.get.asInstanceOf[Type[Byte]]
+
+    def CharTag: Type[Char] =
+      tasty.defn.CharType.seal.get.asInstanceOf[Type[Char]]
+
+    def ShortTag: Type[Short] =
+      tasty.defn.ShortType.seal.get.asInstanceOf[Type[Short]]
+
+    def IntTag: Type[Int] =
+      tasty.defn.IntType.seal.get.asInstanceOf[Type[Int]]
+
+    def LongTag: Type[Long] =
+      tasty.defn.LongType.seal.get.asInstanceOf[Type[Long]]
+
+    def FloatTag: Type[Float] =
+      tasty.defn.FloatType.seal.get.asInstanceOf[Type[Float]]
+
+    def DoubleTag: Type[Double] =
+      tasty.defn.DoubleType.seal.get.asInstanceOf[Type[Double]]
+
   /** Low-level Typed AST API `tasty` meta-programming API.
    *  This API does not have the static type guarantiees that `Expr` and `Type` provide.
    */

library/src-bootstrapped/scala/quoted/Type.scala

@@ -24,7 +24,7 @@ import dotty.tools.io.{Path, VirtualFile}
 
 import scala.annotation.tailrec
 import scala.concurrent.Promise
-import scala.quoted.{Expr, Type}
+import scala.quoted.Expr
 
 /** Compiler that takes the contents of a quoted expression `expr` and produces
  *  a class file with `class ' { def apply: Object = expr }`.

staging/src/scala/quoted/staging/QuoteCompiler.scala

@@ -1,4 +1,4 @@
-import scala.quoted.{ Scope, Expr, Type }
+import scala.quoted._
 
 trait M[T] {
   def f: Any

tests/pos-macros/i7322/Macro_1.scala

@@ -2,6 +2,6 @@ import scala.quoted._, scala.deriving._
 
 inline def mcr: Any = ${mcrImpl}
 def mcrImpl(using s: Scope): s.Expr[Any] = {
-  val tpl: (Expr[1], Expr[2], Expr[3]) = ('{1}, '{2}, '{3}).asInstanceOf // FIXME remove the .asInstanceOf
+  val tpl: (s.Expr[1], s.Expr[2], s.Expr[3]) = ('{1}, '{2}, '{3}).asInstanceOf // FIXME remove the .asInstanceOf
   '{val res: (1, 2, 3) = ${Expr.ofTuple(tpl)}; res}
 }