Merge pull request #10336 from dotty-staging/remove-StopQuotedContext-from-report

Remove report.StopQuotedContext

Author: nicolasstucki

compiler/src/dotty/tools/dotc/transform/Splicer.scala

@@ -62,7 +62,7 @@ object Splicer {
       catch {
         case ex: CompilationUnit.SuspendException =>
           throw ex
-        case ex: scala.quoted.report.StopQuotedContext if ctx.reporter.hasErrors =>
+        case ex: scala.quoted.internal.StopMacroExpansion if ctx.reporter.hasErrors =>
            // errors have been emitted
           EmptyTree
         case ex: StopInterpretation =>
@@ -419,7 +419,7 @@ object Splicer {
           throw new StopInterpretation(sw.toString, pos)
         case ex: InvocationTargetException =>
           ex.getTargetException match {
-            case ex: scala.quoted.report.StopQuotedContext =>
+            case ex: scala.quoted.internal.StopMacroExpansion =>
               throw ex
             case MissingClassDefinedInCurrentRun(sym) if ctx.compilationUnit.isSuspendable =>
               if (ctx.settings.XprintSuspension.value)

library/src/scala/quoted/internal/StopMacroExpansion.scala

@@ -0,0 +1,4 @@
+package scala.quoted.internal
+
+/** Throwable used to stop the expansion of a macro after an error was reported */
+class StopMacroExpansion extends Throwable

library/src/scala/quoted/report.scala

@@ -12,15 +12,15 @@ object report:
     import qctx.reflect._
     Reporting.error(msg, Term.of(expr).pos)
 
-  /** Report an error at the position of the macro expansion and throws a StopQuotedContext */
+  /** Report an error at the position of the macro expansion and throws a StopMacroExpansion */
   def throwError(msg: => String)(using qctx: QuoteContext): Nothing = {
     error(msg)
-    throw new StopQuotedContext
+    throw new internal.StopMacroExpansion
   }
-  /** Report an error at the on the position of `expr` and throws a StopQuotedContext */
+  /** Report an error at the on the position of `expr` and throws a StopMacroExpansion */
   def throwError(msg: => String, expr: Expr[Any])(using qctx: QuoteContext): Nothing = {
     error(msg, expr)
-    throw new StopQuotedContext
+    throw new internal.StopMacroExpansion
   }
 
   /** Report a warning */
@@ -33,7 +33,4 @@ object report:
     import qctx.reflect._
     Reporting.warning(msg, Term.of(expr).pos)
 
-  /** Throwable used to stop the expansion of a macro after an error was reported */
-  class StopQuotedContext extends Throwable
-
 end report