Skip to content

Commit 3eb1dea

Browse files
nicolasstuckinicolasstucki
committed
Refactor Reflection error reporting
1 parent 4b8a1de commit 3eb1dea

File tree

17 files changed

+52
-43
lines changed

17 files changed

+52
-43
lines changed

‎compiler/src/dotty/tools/dotc/quoted/QuoteContextImpl.scala‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2573,17 +2573,19 @@ class QuoteContextImpl private (ctx: Context) extends QuoteContext:
25732573
case cu => ""
25742574
end Source
25752575

2576-
def error(msg: => String, pos: Position): Unit =
2577-
dotc.report.error(msg, pos)
2576+
object Reporting extends ReportingModule:
2577+
def error(msg: => String, pos: Position): Unit =
2578+
dotc.report.error(msg, pos)
25782579

2579-
def error(msg: => String, sourceFile: SourceFile, start: Int, end: Int): Unit =
2580-
dotc.report.error(msg, dotc.util.SourcePosition(sourceFile, dotc.util.Spans.Span(start, end)))
2580+
def error(msg: => String, sourceFile: SourceFile, start: Int, end: Int): Unit =
2581+
dotc.report.error(msg, dotc.util.SourcePosition(sourceFile, dotc.util.Spans.Span(start, end)))
25812582

2582-
def warning(msg: => String, pos: Position): Unit =
2583-
dotc.report.warning(msg, pos)
2583+
def warning(msg: => String, pos: Position): Unit =
2584+
dotc.report.warning(msg, pos)
25842585

2585-
def warning(msg: => String, sourceFile: SourceFile, start: Int, end: Int): Unit =
2586-
dotc.report.error(msg, dotc.util.SourcePosition(sourceFile, dotc.util.Spans.Span(start, end)))
2586+
def warning(msg: => String, sourceFile: SourceFile, start: Int, end: Int): Unit =
2587+
dotc.report.error(msg, dotc.util.SourcePosition(sourceFile, dotc.util.Spans.Span(start, end)))
2588+
end Reporting
25872589

25882590
type Documentation = dotc.core.Comments.Comment
25892591

‎library/src-bootstrapped/scala/quoted/report.scala‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ object report:
44

55
/** Report an error at the position of the macro expansion */
66
def error(msg: => String)(using qctx: QuoteContext): Unit =
7-
qctx.tasty.error(msg, qctx.tasty.rootPosition)
7+
qctx.tasty.Reporting.error(msg, qctx.tasty.rootPosition)
88

99
/** Report an error at the on the position of `expr` */
1010
def error(msg: => String, expr: Expr[Any])(using qctx: QuoteContext): Unit =
11-
qctx.tasty.error(msg, expr.unseal.pos)
11+
qctx.tasty.Reporting.error(msg, expr.unseal.pos)
1212

1313
/** Report an error at the position of the macro expansion and throws a StopQuotedContext */
1414
def throwError(msg: => String)(using qctx: QuoteContext): Nothing = {
@@ -23,11 +23,11 @@ object report:
2323

2424
/** Report a warning */
2525
def warning(msg: => String)(using qctx: QuoteContext): Unit =
26-
qctx.tasty.warning(msg, qctx.tasty.rootPosition)
26+
qctx.tasty.Reporting.warning(msg, qctx.tasty.rootPosition)
2727

2828
/** Report a warning at the on the position of `expr` */
2929
def warning(msg: => String, expr: Expr[_])(using qctx: QuoteContext): Unit =
30-
qctx.tasty.warning(msg, expr.unseal.pos)
30+
qctx.tasty.Reporting.warning(msg, expr.unseal.pos)
3131

3232
/** Throwable used to stop the expansion of a macro after an error was reported */
3333
class StopQuotedContext extends Throwable

‎library/src/scala/tasty/Reflection.scala‎

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3235,19 +3235,26 @@ trait Reflection { reflection =>
32353235
// REPORTING //
32363236
///////////////
32373237

3238-
// TODO: these should not be top level
3238+
val Reporting: ReportingModule
32393239

3240-
/** Emits an error message */
3241-
def error(msg: => String, pos: Position): Unit
3240+
/** Module containg error and waring reporiting.
3241+
*
3242+
* Also see scala.quoted.report
3243+
*/
3244+
trait ReportingModule { self: Reporting.type =>
3245+
/** Emits an error message */
3246+
def error(msg: => String, pos: Position): Unit
32423247

3243-
/** Emits an error at a specific range of a file */
3244-
def error(msg: => String, source: SourceFile, start: Int, end: Int): Unit
3248+
/** Emits an error at a specific range of a file */
3249+
def error(msg: => String, source: SourceFile, start: Int, end: Int): Unit
32453250

3246-
/** Emits an error message */
3247-
def warning(msg: => String, pos: Position): Unit
3251+
/** Emits an error message */
3252+
def warning(msg: => String, pos: Position): Unit
3253+
3254+
/** Emits a warning at a specific range of a file */
3255+
def warning(msg: => String, source: SourceFile, start: Int, end: Int): Unit
3256+
}
32483257

3249-
/** Emits a warning at a specific range of a file */
3250-
def warning(msg: => String, source: SourceFile, start: Int, end: Int): Unit
32513258

32523259
///////////////////
32533260
// DOCUMENTATION //

‎tests/neg-macros/delegate-match-1/Macro_1.scala‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ private def fImpl(using qctx: QuoteContext): Expr[Unit] = {
99
case x: ImplicitSearchSuccess =>
1010
'{}
1111
case x: DivergingImplicit => '{}
12-
error("DivergingImplicit\n" + x.explanation, rootPosition)
12+
Reporting.error("DivergingImplicit\n" + x.explanation, rootPosition)
1313
'{}
1414
case x: NoMatchingImplicits =>
15-
error("NoMatchingImplicits\n" + x.explanation, rootPosition)
15+
Reporting.error("NoMatchingImplicits\n" + x.explanation, rootPosition)
1616
'{}
1717
case x: AmbiguousImplicits =>
18-
error("AmbiguousImplicits\n" + x.explanation, rootPosition)
18+
Reporting.error("AmbiguousImplicits\n" + x.explanation, rootPosition)
1919
'{}
2020
}
2121
}

‎tests/neg-macros/delegate-match-2/Macro_1.scala‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ private def fImpl (using qctx: QuoteContext) : Expr[Unit] = {
99
case x: ImplicitSearchSuccess =>
1010
'{}
1111
case x: DivergingImplicit => '{}
12-
error("DivergingImplicit\n" + x.explanation, rootPosition)
12+
Reporting.error("DivergingImplicit\n" + x.explanation, rootPosition)
1313
'{}
1414
case x: NoMatchingImplicits =>
15-
error("NoMatchingImplicits\n" + x.explanation, rootPosition)
15+
Reporting.error("NoMatchingImplicits\n" + x.explanation, rootPosition)
1616
'{}
1717
case x: AmbiguousImplicits =>
18-
error("AmbiguousImplicits\n" + x.explanation, rootPosition)
18+
Reporting.error("AmbiguousImplicits\n" + x.explanation, rootPosition)
1919
'{}
2020
}
2121
}

‎tests/neg-macros/delegate-match-3/Macro_1.scala‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ private def fImpl(using qctx: QuoteContext) : Expr[Unit] = {
99
case x: ImplicitSearchSuccess =>
1010
'{}
1111
case x: DivergingImplicit => '{}
12-
error("DivergingImplicit\n" + x.explanation, rootPosition)
12+
Reporting.error("DivergingImplicit\n" + x.explanation, rootPosition)
1313
'{}
1414
case x: NoMatchingImplicits =>
15-
error("NoMatchingImplicits\n" + x.explanation, rootPosition)
15+
Reporting.error("NoMatchingImplicits\n" + x.explanation, rootPosition)
1616
'{}
1717
case x: AmbiguousImplicits =>
18-
error("AmbiguousImplicits\n" + x.explanation, rootPosition)
18+
Reporting.error("AmbiguousImplicits\n" + x.explanation, rootPosition)
1919
'{}
2020
}
2121
}

‎tests/neg-macros/i6432/Macro_1.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ object Macro {
1010
sc match {
1111
case '{ StringContext(${Varargs(parts)}: _*) } =>
1212
for (part @ Const(s) <- parts)
13-
error(s, part.unseal.pos)
13+
Reporting.error(s, part.unseal.pos)
1414
}
1515
'{}
1616
}

‎tests/neg-macros/i6432b/Macro_1.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ object Macro {
1010
sc match {
1111
case '{ StringContext(${Varargs(parts)}: _*) } =>
1212
for (part @ Const(s) <- parts)
13-
error(s, part.unseal.pos)
13+
Reporting.error(s, part.unseal.pos)
1414
}
1515
'{}
1616
}

‎tests/neg-macros/i9801/Macro_1.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ def impl(prog: Expr[Double])(using QuoteContext) : Expr[Double] =
1515
triggerStackOverflow(0)
1616
} catch {
1717
case e =>
18-
qctx.tasty.error(e.getMessage, prog.unseal.pos)
18+
qctx.tasty.Reporting.error(e.getMessage, prog.unseal.pos)
1919
'{ 42.0 }
2020
}

‎tests/neg-macros/macros-in-same-project-6/Foo.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ object Foo {
66

77
def aMacroImplementation(using qctx: QuoteContext) : Expr[Unit] = {
88
import qctx.tasty._
9-
error("some error", rootPosition)
9+
Reporting.error("some error", rootPosition)
1010
throw new NoClassDefFoundError("Bar$")
1111
}
1212
}

0 commit comments

Comments
 (0)