Use QuoteScope in some methods

Author: nicolasstucki

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

@@ -45,7 +45,7 @@ class Expr[+T] private[scala] {
     qctx.tasty.internal.QuotedExpr_cast[U](this)(using tp, qctx.tasty.rootContext)
 
   /** View this expression `quoted.Expr[T]` as a `Term` */
-  def unseal(using qctx: QuoteContext): qctx.tasty.Term =
+  def unseal(using qctx: QuoteScope): qctx.tasty.Term =
     qctx.tasty.internal.QuotedExpr_unseal(this)(using qctx.tasty.rootContext)
 
 }
@@ -78,15 +78,15 @@ object Expr {
     tg.untupled(args => qctx.tasty.internal.betaReduce(f.unseal, args.toArray.toList.map(_.asInstanceOf[QuoteContext => Expr[Any]](qctx).unseal)).seal.asInstanceOf[Expr[R]])
 
   /** Returns a null expresssion equivalent to `'{null}` */
-  def nullExpr: QuoteContext ?=> Expr[Null] = qctx ?=> {
+  def nullExpr: (s: QuoteScope) ?=> s.Expr[Null] = {
     import qctx.tasty._
-    Literal(Constant(null)).seal.asInstanceOf[Expr[Null]]
+    Literal(Constant(null)).seal.asInstanceOf[qctx.Expr[Null]]
   }
 
   /** Returns a unit expresssion equivalent to `'{}` or `'{()}` */
-  def unitExpr: QuoteContext ?=> Expr[Unit] = qctx ?=> {
+  def unitExpr: (s: QuoteScope) ?=> s.Expr[Unit] = {
     import qctx.tasty._
-    Literal(Constant(())).seal.asInstanceOf[Expr[Unit]]
+    Literal(Constant(())).seal.asInstanceOf[qctx.Expr[Unit]]
   }
 
   /** Returns an expression containing a block with the given statements and ending with the expresion

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

@@ -26,6 +26,9 @@ trait QuoteContext extends QuoteScope { self =>
 }
 
 object QuoteContext {
+
+  given unsafeQuoteContext as Conversion[QuoteScope, QuoteContext] = _.asInstanceOf
+
   // TODO remove in 0.26.0
   @deprecated("Errors and warnings have been moved to scala.quoted.Reporting", "0.25.0")
   given error_and_warining_on_QuoteContext as Conversion[QuoteContext, Reporting.type] = _ => Reporting

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

@@ -3,33 +3,34 @@ package scala.quoted
 object Reporting {
 
   /** Report an error at the position of the macro expansion */
-  def error(msg: => String)(using qctx: QuoteContext): Unit =
+  def error(msg: => String)(using QuoteScope): Unit =
     qctx.tasty.error(msg, qctx.tasty.rootPosition)
 
   /** Report an error at the on the position of `expr` */
-  def error(msg: => String, expr: Expr[Any])(using qctx: QuoteContext): Unit =
+  def error(msg: => String, expr: Expr[Any])(using QuoteScope): Unit =
     qctx.tasty.error(msg, expr.unseal.pos)
 
   /** Report an error at the position of the macro expansion and throws a StopQuotedContext */
-  def throwError(msg: => String)(using qctx: QuoteContext): Nothing = {
+  def throwError(msg: => String)(using QuoteScope): Nothing = {
     error(msg)
     throw new StopQuotedContext
   }
   /** Report an error at the on the position of `expr` and throws a StopQuotedContext */
-  def throwError(msg: => String, expr: Expr[Any])(using qctx: QuoteContext): Nothing = {
+  def throwError(msg: => String, expr: Expr[Any])(using QuoteScope): Nothing = {
     error(msg, expr)
     throw new StopQuotedContext
   }
 
   /** Report a warning */
-  def warning(msg: => String)(using qctx: QuoteContext): Unit =
+  def warning(msg: => String)(using qctx: QuoteScope): Unit =
     qctx.tasty.warning(msg, qctx.tasty.rootPosition)
 
   /** Report a warning at the on the position of `expr` */
-  def warning(msg: => String, expr: Expr[_])(using qctx: QuoteContext): Unit =
+  def warning(msg: => String, expr: Expr[_])(using QuoteScope): Unit =
     qctx.tasty.warning(msg, expr.unseal.pos)
 
   /** Throwable used to stop the expansion of a macro after an error was reported */
+  // TODO rename to StopQuotedScope
   class StopQuotedContext extends Throwable
 
 }

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

@@ -23,31 +23,31 @@ class Type[T <: AnyKind] private[scala] {
 /** Some basic type tags, currently incomplete */
 object Type {
 
-  def UnitTag: QuoteContext ?=> Type[Unit] =
-    qctx.tasty.defn.UnitType.seal.asInstanceOf[quoted.Type[Unit]]
+  def UnitTag: (s: QuoteScope) ?=> s.Type[Unit] =
+    qctx.tasty.defn.UnitType.seal.asInstanceOf[qctx.Type[Unit]]
 
-  def BooleanTag: QuoteContext ?=> Type[Boolean] =
-    qctx.tasty.defn.BooleanType.seal.asInstanceOf[quoted.Type[Boolean]]
+  def BooleanTag: (s: QuoteScope) ?=> s.Type[Boolean] =
+    qctx.tasty.defn.BooleanType.seal.asInstanceOf[qctx.Type[Boolean]]
 
-  def ByteTag: QuoteContext ?=> Type[Byte] =
-    qctx.tasty.defn.ByteType.seal.asInstanceOf[quoted.Type[Byte]]
+  def ByteTag: (s: QuoteScope) ?=> s.Type[Byte] =
+    qctx.tasty.defn.ByteType.seal.asInstanceOf[qctx.Type[Byte]]
 
-  def CharTag: QuoteContext ?=> Type[Char] =
-    qctx.tasty.defn.CharType.seal.asInstanceOf[quoted.Type[Char]]
+  def CharTag: (s: QuoteScope) ?=> s.Type[Char] =
+    qctx.tasty.defn.CharType.seal.asInstanceOf[qctx.Type[Char]]
 
-  def ShortTag: QuoteContext ?=> Type[Short] =
-    qctx.tasty.defn.ShortType.seal.asInstanceOf[quoted.Type[Short]]
+  def ShortTag: (s: QuoteScope) ?=> s.Type[Short] =
+    qctx.tasty.defn.ShortType.seal.asInstanceOf[qctx.Type[Short]]
 
-  def IntTag: QuoteContext ?=> Type[Int] =
-    qctx.tasty.defn.IntType.seal.asInstanceOf[quoted.Type[Int]]
+  def IntTag: (s: QuoteScope) ?=> s.Type[Int] =
+    qctx.tasty.defn.IntType.seal.asInstanceOf[qctx.Type[Int]]
 
-  def LongTag: QuoteContext ?=> Type[Long] =
-    qctx.tasty.defn.LongType.seal.asInstanceOf[quoted.Type[Long]]
+  def LongTag: (s: QuoteScope) ?=> s.Type[Long] =
+    qctx.tasty.defn.LongType.seal.asInstanceOf[qctx.Type[Long]]
 
-  def FloatTag: QuoteContext ?=> Type[Float] =
-    qctx.tasty.defn.FloatType.seal.asInstanceOf[quoted.Type[Float]]
+  def FloatTag: (s: QuoteScope) ?=> s.Type[Float] =
+    qctx.tasty.defn.FloatType.seal.asInstanceOf[qctx.Type[Float]]
 
-  def DoubleTag: QuoteContext ?=> Type[Double] =
-    qctx.tasty.defn.DoubleType.seal.asInstanceOf[quoted.Type[Double]]
+  def DoubleTag: (s: QuoteScope) ?=> s.Type[Double] =
+    qctx.tasty.defn.DoubleType.seal.asInstanceOf[qctx.Type[Double]]
 
 }

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

@@ -1,4 +1,4 @@
 package scala.quoted
 
 /** Current QuoteContext in scope */
-def qctx(using qctx: QuoteContext): qctx.type = qctx
+def qctx(using s: QuoteScope): s.type = s

library/src-non-bootstrapped/scala/quoted/Reporting.scala

@@ -3,6 +3,7 @@ package scala.quoted
 object Reporting {
 
   /** Throwable used to stop the expansion of a macro after an error was reported */
+  // TODO rename to StopQuotedScope
   class StopQuotedContext extends Throwable
 
 }