Merge pull request #10229 from dotty-staging/remove-Expr-cast-exception

Remove internal.quoted.{ExprCastError, ScopeException}

Author: nicolasstucki

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

@@ -24,7 +24,7 @@ final class Expr[Tree](val tree: Tree, val scopeId: Int) extends scala.quoted.Ex
 
   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(...)`")
+      throw new Exception("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

@@ -19,7 +19,7 @@ final class Type[Tree](val typeTree: Tree, val scopeId: Int) extends scala.quote
 
   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(...)`")
+      throw new Exception("Cannot call `scala.quoted.staging.run(...)` within a macro or another `run(...)`")
 
   override def hashCode: Int = typeTree.hashCode
   override def toString: String = "'[ ... ]"

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

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

library/src/scala/internal/quoted/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 scala.internal.quoted.ScopeException("Cannot call `scala.quoted.staging.run(...)` within a another `run(...)`")
+            throw new Exception("Cannot call `scala.quoted.staging.run(...)` within a another `run(...)`")
           running = true
           driver.run(exprBuilder, settings)
         finally

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

@@ -5,7 +5,7 @@ object Test {
   given Toolbox = Toolbox.make(getClass.getClassLoader)
   def ret(using QuoteContext): Expr[Int => Int] = '{ (x: Int) =>
     ${
-      val z = run('{x + 1}) // throws a RunScopeException
+      val z = run('{x + 1}) // throws Exception("Cannot call `scala.quoted.staging.run(...)` within a another `run(...)`")
       Expr(z)
     }
   }
@@ -21,7 +21,7 @@ package scala {
         run(Test.ret).apply(10)
         throw new Exception
       } catch {
-        case ex: scala.internal.quoted.ScopeException =>
+        case ex: Exception if ex.getMessage == "Cannot call `scala.quoted.staging.run(...)` within a another `run(...)`" =>
           // ok
       }
     }

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

@@ -22,7 +22,7 @@ package scala {
         throw new Exception
       } catch {
         case ex: java.lang.reflect.InvocationTargetException =>
-          assert(ex.getTargetException.isInstanceOf[scala.internal.quoted.ScopeException])
+          assert(ex.getTargetException.getMessage == "Cannot call `scala.quoted.staging.run(...)` within a another `run(...)`")
       }
     }
   }

tests/run-staging/i4730.scala

@@ -25,7 +25,7 @@ package scala {
           case '{$x: Foo} => Expr(run(x).x)
         }
       } catch {
-        case ex: scala.internal.quoted.ScopeException =>
+        case ex: Exception if ex.getMessage == "Cannot call `scala.quoted.staging.run(...)` within a macro or another `run(...)`" =>
           '{"OK"}
       }
     }