Hide quote related exceptions from users

Users should never throw or catch these exceptions.

Author: nicolasstucki

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

@@ -36,7 +36,7 @@ object QuoteContextImpl {
 
   private[dotty] def checkScopeId(id: ScopeId)(using Context): Unit =
     if (id != scopeId)
-      throw new scala.quoted.ScopeException("Cannot call `scala.quoted.staging.run(...)` within a macro or another `run(...)`")
+      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.

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

@@ -21,7 +21,7 @@ import scala.internal.quoted.CompilerInterface.quoteContextWithCompilerInterface
 
   def unseal(using qctx: QuoteContext): qctx.reflect.Term =
     if (qctx.hashCode != scopeId)
-      throw new scala.quoted.ScopeException("Cannot call `scala.quoted.staging.run(...)` within a macro or another `run(...)`")
+      throw new scala.internal.quoted.ScopeException("Cannot call `scala.quoted.staging.run(...)` within a macro or another `run(...)`")
     tree.asInstanceOf[qctx.reflect.Term]
 
   override def hashCode: Int = tree.hashCode

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

@@ -16,7 +16,7 @@ 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.quoted.ScopeException("Cannot call `scala.quoted.staging.run(...)` within a macro or another `run(...)`")
+      throw new scala.internal.quoted.ScopeException("Cannot call `scala.quoted.staging.run(...)` within a macro or another `run(...)`")
     typeTree.asInstanceOf[qctx.reflect.TypeTree]
 
   override def hashCode: Int = typeTree.hashCode

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

@@ -32,7 +32,7 @@ abstract class Expr[+T] private[scala] {
     if isExprOf[X] then
       this.asInstanceOf[scala.quoted.Expr[X]]
     else
-      throw new tasty.reflect.ExprCastError(
+      throw new scala.internal.quoted.ExprCastError(
         s"""Expr: ${this.show}
            |of type: ${this.unseal.tpe.show}
            |did not conform to type: ${tp.unseal.tpe.show}

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

@@ -20,7 +20,7 @@ import scala.quoted._
 
   def unseal(using qctx: QuoteContext): qctx.reflect.Term =
     if (qctx.hashCode != scopeId)
-      throw new scala.quoted.ScopeException("Cannot call `scala.quoted.staging.run(...)` within a macro or another `run(...)`")
+      throw new scala.internal.quoted.ScopeException("Cannot call `scala.quoted.staging.run(...)` within a macro or another `run(...)`")
     tree.asInstanceOf[qctx.reflect.Term]
 
   override def hashCode: Int = tree.hashCode

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

@@ -15,7 +15,7 @@ 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.quoted.ScopeException("Cannot call `scala.quoted.staging.run(...)` within a macro or another `run(...)`")
+      throw new scala.internal.quoted.ScopeException("Cannot call `scala.quoted.staging.run(...)` within a macro or another `run(...)`")
     typeTree.asInstanceOf[qctx.reflect.TypeTree]
 
   override def hashCode: Int = typeTree.hashCode

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

@@ -0,0 +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)

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

@@ -1,4 +1,4 @@
-package scala.quoted
+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)

library/src/scala/tasty/reflect/ExprCastError.scala

@@ -31,7 +31,7 @@ object Toolbox:
       def run[T](exprBuilder: QuoteContext => Expr[T]): T = synchronized {
         try
           if (running) // detected nested run
-            throw new ScopeException("Cannot call `scala.quoted.staging.run(...)` within a another `run(...)`")
+            throw new scala.internal.quoted.ScopeException("Cannot call `scala.quoted.staging.run(...)` within a another `run(...)`")
           running = true
           driver.run(exprBuilder, settings)
         finally

staging/src/scala/quoted/staging/Toolbox.scala

@@ -14,7 +14,7 @@ object Test {
       run(ret).apply(10)
       throw new Exception
     } catch {
-      case ex: scala.quoted.ScopeException =>
+      case ex: scala.internal.quoted.ScopeException =>
         // ok
     }
   }

tests/run-staging/i4730.scala

@@ -16,7 +16,7 @@ object Test {
       throw new Exception
     } catch {
       case ex: java.lang.reflect.InvocationTargetException =>
-        assert(ex.getTargetException.isInstanceOf[scala.quoted.ScopeException])
+        assert(ex.getTargetException.isInstanceOf[scala.internal.quoted.ScopeException])
     }
   }
 }

tests/run-staging/i6754.scala

@@ -16,7 +16,7 @@ object macros {
         case '{$x: Foo} => Expr(run(x).x)
       }
     } catch {
-      case ex: scala.quoted.ScopeException =>
+      case ex: scala.internal.quoted.ScopeException =>
         '{"OK"}
     }
   }