Move exception definitions outside the Toolbox

Author: nicolasstucki

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

@@ -22,7 +22,7 @@ object ToolboxImpl {
     def run[T](exprBuilder: QuoteContext => Expr[T]): T = synchronized {
       try {
         if (running) // detected nested run
-          throw new scala.quoted.staging.Toolbox.RunScopeException()
+          throw new scala.quoted.staging.RunScopeException()
         running = true
         driver.run(exprBuilder, settings)
       } finally {
@@ -35,7 +35,7 @@ object ToolboxImpl {
 
   private[dotty] def checkScopeId(id: ScopeId) given Context: Unit = {
     if (id != scopeId)
-      throw new staging.Toolbox.RunScopeException
+      throw new scala.quoted.staging.RunScopeException
   }
 
   // TODO Explore more fine grained scope ids.

library/src/scala/quoted/staging/RunScopeException.scala

@@ -0,0 +1,3 @@
+package scala.quoted.staging
+
+class RunScopeException extends Exception("Cannot call `scala.quoted.staging.run(...)` within a macro or another `run(...)`")

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

@@ -56,8 +56,4 @@ object Toolbox {
       new Settings(outDir, showRawTree, compilerArgs)
   }
 
-  class ToolboxNotFoundException(msg: String, cause: ClassNotFoundException) extends Exception(msg, cause)
-
-  class RunScopeException extends Exception("Cannot call `scala.quoted.staging.run(...)` within a macro or another `run(...)`")
-
 }

library/src/scala/quoted/staging/ToolboxNotFoundException.scala

@@ -0,0 +1,3 @@
+package scala.quoted.staging
+
+class ToolboxNotFoundException(msg: String, cause: ClassNotFoundException) extends Exception(msg, cause)

tests/run-macros/i6992/Macro_1.scala

@@ -17,7 +17,7 @@ object macros {
         case '{$x: Foo} => run(x).x.toExpr
       }
     } catch {
-      case _: scala.quoted.staging.Toolbox.RunScopeException =>
+      case _: scala.quoted.staging.RunScopeException =>
         '{"OK"}
     }
   }

tests/run-with-compiler/i4730.scala

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

tests/run-with-compiler/i6754.scala

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