Add scala.quoted.internal.ScopeException

Author: nicolasstucki

compiler/src/scala/quoted/internal/Expr.scala

@@ -26,7 +26,7 @@ final class Expr(val tree: tpd.Tree, val scopeId: Int) extends scala.quoted.Expr
 
   def checkScopeId(expectedScopeId: Int): Unit =
     if expectedScopeId != scopeId then
-      throw new Exception("Cannot call `scala.quoted.staging.run(...)` within a macro or another `run(...)`")
+      throw new ScopeException("Cannot call `scala.quoted.staging.run(...)` within a macro or another `run(...)`")
 
   override def hashCode: Int = tree.hashCode
   override def toString: String = "'{ ... }"

compiler/src/scala/quoted/internal/ScopeException.scala

@@ -0,0 +1,3 @@
+package scala.quoted.internal
+
+class ScopeException(msg: String) extends Exception(msg)

compiler/src/scala/quoted/internal/Type.scala

@@ -21,7 +21,7 @@ final class Type(val typeTree: tpd.Tree, val scopeId: Int) extends scala.quoted.
 
   def checkScopeId(expectedScopeId: Int): Unit =
     if expectedScopeId != scopeId then
-      throw new Exception("Cannot call `scala.quoted.staging.run(...)` within a macro or another `run(...)`")
+      throw new ScopeException("Cannot call `scala.quoted.staging.run(...)` within a macro or another `run(...)`")
 
   override def hashCode: Int = typeTree.hashCode
   override def toString: String = "'[ ... ]"

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

@@ -3,6 +3,8 @@ package staging
 
 import scala.annotation.implicitNotFound
 
+import scala.quoted.internal.ScopeException
+
 @implicitNotFound("Could not find implicit scala.quoted.staging.Toolbox.\n\nDefault toolbox can be instantiated with:\n  `given scala.quoted.staging.Toolbox = scala.quoted.staging.Toolbox.make(getClass.getClassLoader)`\n\n")
 trait Toolbox:
   def run[T](expr: QuoteContext => Expr[T]): T
@@ -31,7 +33,7 @@ object Toolbox:
       def run[T](exprBuilder: QuoteContext => Expr[T]): T = synchronized {
         try
           if (running) // detected nested run
-            throw new Exception("Cannot call `scala.quoted.staging.run(...)` within a another `run(...)`")
+            throw new ScopeException("Cannot call `scala.quoted.staging.run(...)` within a another `run(...)`")
           running = true
           driver.run(exprBuilder, settings)
         finally

tests/run-staging/i4730.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 Exception("Cannot call `scala.quoted.staging.run(...)` within a another `run(...)`")
+      val z = run('{x + 1}) // throws scala.quoted.internal.ScopeException =>
       Expr(z)
     }
   }
@@ -21,7 +21,7 @@ package scala {
         run(Test.ret).apply(10)
         throw new Exception
       } catch {
-        case ex: Exception if ex.getMessage == "Cannot call `scala.quoted.staging.run(...)` within a another `run(...)`" =>
+        case ex: Exception if ex.getClass.getName == "scala.quoted.internal.ScopeException" =>
           // ok
       }
     }

tests/run-staging/i6754.scala

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

tests/run-staging/i6992/Macro_1.scala

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