Make ExprCastError and ScopeException private[scala]

Author: nicolasstucki

compiler/src/dotty/tools/dotc/quoted/PickledQuotes.scala

@@ -40,14 +40,14 @@ object PickledQuotes {
   /** Transform the expression into its fully spliced Tree */
   def quotedExprToTree[T](expr: quoted.Expr[T])(using Context): Tree = {
     val expr1 = expr.asInstanceOf[scala.internal.quoted.Expr[Tree]]
-    QuoteContextImpl.checkScopeId(expr1.scopeId)
+    expr1.checkScopeId(QuoteContextImpl.scopeId)
     changeOwnerOfTree(expr1.tree, ctx.owner)
   }
 
   /** Transform the expression into its fully spliced TypeTree */
   def quotedTypeToTree(tpe: quoted.Type[?])(using Context): Tree = {
     val tpe1 = tpe.asInstanceOf[scala.internal.quoted.Type[Tree]]
-    QuoteContextImpl.checkScopeId(tpe1.scopeId)
+    tpe1.checkScopeId(QuoteContextImpl.scopeId)
     changeOwnerOfTree(tpe1.typeTree, ctx.owner)
   }
 

compiler/src/dotty/tools/dotc/quoted/QuoteContextImpl.scala

@@ -34,10 +34,6 @@ object QuoteContextImpl {
       qctx.reflect.TreeMethodsImpl.extension_show(tree)
   }
 
-  private[dotty] def checkScopeId(id: ScopeId)(using Context): Unit =
-    if (id != scopeId)
-      throw new scala.internal.quoted.ScopeException("Cannot call `scala.quoted.staging.run(...)` within a macro or another `run(...)`")
-
   // TODO Explore more fine grained scope ids.
   //      This id can only differentiate scope extrusion from one compiler instance to another.
   private[dotty] def scopeId(using Context): ScopeId =

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

@@ -10,20 +10,23 @@ import scala.internal.quoted.CompilerInterface.quoteContextWithCompilerInterface
  *
  *  May contain references to code defined outside this Expr instance.
  */
- final class Expr[Tree](val tree: Tree, val scopeId: Int) extends scala.quoted.Expr[Any] {
+final class Expr[Tree](val tree: Tree, val scopeId: Int) extends scala.quoted.Expr[Any] {
   override def equals(that: Any): Boolean = that match {
     case that: Expr[_] =>
-      // Expr are wrappers around trees, therfore they are equals if their trees are equal.
+      // Expr are wrappers around trees, therefore they are equals if their trees are equal.
       // All scopeId should be equal unless two different runs of the compiler created the trees.
       tree == that.tree && scopeId == that.scopeId
     case _ => false
   }
 
   def unseal(using qctx: QuoteContext): qctx.reflect.Term =
-    if (qctx.hashCode != scopeId)
-      throw new scala.internal.quoted.ScopeException("Cannot call `scala.quoted.staging.run(...)` within a macro or another `run(...)`")
+    checkScopeId(qctx.hashCode)
     tree.asInstanceOf[qctx.reflect.Term]
 
+  def checkScopeId(expectedScopeId: Int): Unit =
+    if expectedScopeId != scopeId then
+      throw new scala.internal.quoted.ScopeException("Cannot call `scala.quoted.staging.run(...)` within a macro or another `run(...)`")
+
   override def hashCode: Int = tree.hashCode
   override def toString: String = "'{ ... }"
 }

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

@@ -15,10 +15,13 @@ final class Type[Tree](val typeTree: Tree, val scopeId: Int) extends scala.quote
 
   /** View this expression `quoted.Type[T]` as a `TypeTree` */
   def unseal(using qctx: QuoteContext): qctx.reflect.TypeTree =
-    if (qctx.hashCode != scopeId)
-      throw new scala.internal.quoted.ScopeException("Cannot call `scala.quoted.staging.run(...)` within a macro or another `run(...)`")
+    checkScopeId(qctx.hashCode)
     typeTree.asInstanceOf[qctx.reflect.TypeTree]
 
+  def checkScopeId(expectedScopeId: Int): Unit =
+    if expectedScopeId != scopeId then
+      throw new scala.internal.quoted.ScopeException("Cannot call `scala.quoted.staging.run(...)` within a macro or another `run(...)`")
+
   override def hashCode: Int = typeTree.hashCode
   override def toString: String = "'[ ... ]"
 }

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

@@ -19,9 +19,10 @@ import scala.quoted._
   }
 
   def unseal(using qctx: QuoteContext): qctx.reflect.Term =
-    if (qctx.hashCode != scopeId)
-      throw new scala.internal.quoted.ScopeException("Cannot call `scala.quoted.staging.run(...)` within a macro or another `run(...)`")
-    tree.asInstanceOf[qctx.reflect.Term]
+    throw new Exception("Non bootstrapped lib")
+
+  def checkScopeId(scopeId: Int): Unit =
+    throw new Exception("Non bootstrapped lib")
 
   override def hashCode: Int = tree.hashCode
   override def toString: String = "'{ ... }"

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

@@ -14,9 +14,10 @@ final class Type[Tree](val typeTree: Tree, val scopeId: Int) extends scala.quote
 
   /** View this expression `quoted.Type[T]` as a `TypeTree` */
   def unseal(using qctx: QuoteContext): qctx.reflect.TypeTree =
-    if (qctx.hashCode != scopeId)
-      throw new scala.internal.quoted.ScopeException("Cannot call `scala.quoted.staging.run(...)` within a macro or another `run(...)`")
-    typeTree.asInstanceOf[qctx.reflect.TypeTree]
+    throw new Exception("Non bootstrapped lib")
+
+  def checkScopeId(scopeId: Int): Unit =
+    throw new Exception("Non bootstrapped lib")
 
   override def hashCode: Int = typeTree.hashCode
   override def toString: String = "'[ ... ]"

library/src/scala/internal/quoted/ExprCastError.scala

@@ -1,4 +1,4 @@
 package scala.internal.quoted
 
 /** Exception thrown when an `Expr[?]` is casted to a `Expr[U]` and the expression is not of type `U` */
-class ExprCastError(msg: String) extends Throwable(msg)
+private[scala] class ExprCastError(msg: String) extends Throwable(msg)

library/src/scala/internal/quoted/ScopeException.scala

@@ -1,4 +1,4 @@
 package scala.internal.quoted
 
 /** Exception thrown when an Expr or Type is used ouside of the scope where it is valid */
-class ScopeException(msg: String) extends Exception(msg)
+private[scala] class ScopeException(msg: String) extends Exception(msg)

tests/run-staging/i4730.scala

@@ -10,12 +10,20 @@ object Test {
     }
   }
   def main(args: Array[String]): Unit = {
-    try {
-      run(ret).apply(10)
-      throw new Exception
-    } catch {
-      case ex: scala.internal.quoted.ScopeException =>
-        // ok
+    scala.mytest.myTest()
+  }
+}
+
+package scala {
+  package mytest {
+    def myTest()(using Toolbox) = {
+      try {
+        run(Test.ret).apply(10)
+        throw new Exception
+      } catch {
+        case ex: scala.internal.quoted.ScopeException =>
+          // ok
+      }
     }
   }
 }

tests/run-staging/i6754.scala

@@ -3,20 +3,27 @@ import scala.quoted._
 import scala.quoted.staging._
 
 object Test {
-  implicit val tbx: scala.quoted.staging.Toolbox = scala.quoted.staging.Toolbox.make(getClass.getClassLoader)
+  def main(args: Array[String]): Unit =
+    scala.MyTest.myTest()
+}
 
-  def main(args: Array[String]): Unit = {
-    def y(using QuoteContext): Expr[Unit] = '{
-      def x(using QuoteContext): Expr[Unit] = '{println("bar")}
-      println("foo")
-      run(x)
-    }
-    try {
-      run(y)
-      throw new Exception
-    } catch {
-      case ex: java.lang.reflect.InvocationTargetException =>
-        assert(ex.getTargetException.isInstanceOf[scala.internal.quoted.ScopeException])
+package scala {
+  object MyTest {
+    implicit val tbx: scala.quoted.staging.Toolbox = scala.quoted.staging.Toolbox.make(getClass.getClassLoader)
+
+    def myTest() = {
+      def y(using QuoteContext): Expr[Unit] = '{
+        def x(using QuoteContext): Expr[Unit] = '{println("bar")}
+        println("foo")
+        run(x)
+      }
+      try {
+        run(y)
+        throw new Exception
+      } catch {
+        case ex: java.lang.reflect.InvocationTargetException =>
+          assert(ex.getTargetException.isInstanceOf[scala.internal.quoted.ScopeException])
+      }
     }
   }
 }