Merge pull request #9380 from dotty-staging/rename-Reporing-to-report

Rename `scala.quoted.Reporting` to `report`

Author: nicolasstucki

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

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

library/src-bootstrapped/dotty/internal/CompileTimeMacros.scala

@@ -8,4 +8,4 @@ object CompileTimeMacros:
       case (Expr.StringContext(Consts(parts)), Varargs(args2)) =>
         Expr(StringContext(parts: _*).s(args2.map(_.show): _*))
       case _ =>
-        Reporting.throwError("compiletime.code must be used as a string interpolator `code\"...\"`")
+        report.throwError("compiletime.code must be used as a string interpolator `code\"...\"`")

library/src-bootstrapped/dotty/internal/StringContextMacro.scala

@@ -63,12 +63,12 @@ object StringContextMacro {
 
     val (partsExpr, parts) = strCtxExpr match {
       case Expr.StringContext(p1 @ Consts(p2)) => (p1.toList, p2.toList)
-      case _ => Reporting.throwError("Expected statically known String Context", strCtxExpr)
+      case _ => report.throwError("Expected statically known String Context", strCtxExpr)
     }
 
     val args = argsExpr match {
       case Varargs(args) => args
-      case _ => Reporting.throwError("Expected statically known argument list", argsExpr)
+      case _ => report.throwError("Expected statically known argument list", argsExpr)
     }
 
     val reporter = new Reporter{

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

@@ -27,7 +27,7 @@ abstract class Expr[+T] private[scala] {
    *  Otherwise returns the value.
    */
   final def unliftOrError[U >: T](using qctx: QuoteContext, unlift: Unliftable[U]): U =
-    unlift(this).getOrElse(Reporting.throwError(s"Expected a known value. \n\nThe value of: $show\ncould not be unlifted using $unlift", this))
+    unlift(this).getOrElse(report.throwError(s"Expected a known value. \n\nThe value of: $show\ncould not be unlifted using $unlift", this))
 
   /** Pattern matches `this` against `that`. Effectively performing a deep equality check.
    *  It does the equivalent of

library/src-bootstrapped/scala/quoted/Reporting.scala renamed to library/src-bootstrapped/scala/quoted/report.scala

@@ -1,6 +1,6 @@
 package scala.quoted
 
-object Reporting {
+object report:
 
   /** Report an error at the position of the macro expansion */
   def error(msg: => String)(using qctx: QuoteContext): Unit =
@@ -32,4 +32,7 @@ object Reporting {
   /** Throwable used to stop the expansion of a macro after an error was reported */
   class StopQuotedContext extends Throwable
 
-}
+end report
+
+@deprecated("Use scala.quoted.report", "")
+def Reporting: report.type = report

library/src-non-bootstrapped/scala/quoted/Reporting.scala renamed to library/src-non-bootstrapped/scala/quoted/report.scala

@@ -1,8 +1,5 @@
 package scala.quoted
 
-object Reporting {
-
+object report:
   /** Throwable used to stop the expansion of a macro after an error was reported */
   class StopQuotedContext extends Throwable
-
-}

tests/neg-macros/BigFloat/BigFloatFromDigitsImpl_1.scala

@@ -10,7 +10,7 @@ object BigFloatFromDigitsImpl:
           val BigFloat(m, e) = BigFloat(ds)
           '{BigFloat(${Expr(m)}, ${Expr(e)})}
         catch case ex: FromDigits.FromDigitsException =>
-          Reporting.error(ex.getMessage)
+          report.error(ex.getMessage)
           '{BigFloat(0, 0)}
       case digits =>
         '{BigFloat($digits)}

tests/neg-macros/GenericNumLits/EvenFromDigitsImpl_1.scala

@@ -9,7 +9,7 @@ object EvenFromDigitsImpl:
         try evenFromDigits(ds)
         catch {
           case ex: FromDigits.FromDigitsException =>
-            Reporting.error(ex.getMessage)
+            report.error(ex.getMessage)
             Even(0)
         }
       '{Even(${Expr(ev.n)})}

tests/neg-macros/i9014/Macros_1.scala

@@ -1,4 +1,4 @@
 import scala.quoted._
 trait Bar
 inline given as Bar = ${ impl }
-def impl(using qctx: QuoteContext): Expr[Bar] = Reporting.throwError("Failed to expand!")
+def impl(using qctx: QuoteContext): Expr[Bar] = report.throwError("Failed to expand!")

tests/neg-macros/quote-error-2/Macro_1.scala

@@ -7,6 +7,6 @@ object Macro_1 {
 
   def msg(b: Boolean)(using qctx: QuoteContext): Expr[String] =
     if (b) '{"foo(true)"}
-    else { Reporting.error("foo cannot be called with false"); '{ ??? } }
+    else { report.error("foo cannot be called with false"); '{ ??? } }
 
 }