carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-10-05 22:02:55 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Move diagnostics into a namespace (#5173)

Browse Source 
What this really does is avoids shadowing names, so that we can
comfortable have things like `Check::DiagnosticEmitter` or
`Check::DiagnosticLoc` without shadowing being a concern.

Note, down this path I'm also thinking about:

- Renaming misc DiagnosticConsumer/DiagnosticEmitter classes, possibly
just to DiagnosticConsumer/DiagnosticEmitter (so
`Check::DiagnosticEmitter` instead of `SemIRLocDiagnosticEmitter`).
- Dropping `Diagnostic` from `Emitter::DiagnosticBuilder`.
- But not for `Check::DiagnosticBuilder`, because `Check::Builder` would
be ambiguous.
- Renaming diagnostics/diagnostic_* to drop "diagnostic".

[Discussion about SemIRLoc ->
DiagnosticLoc](https://discord.com/channels/655572317891461132/655578254970716160/1353771570463768698)
reminded me of this (in particular the older [Check::DiagnosticBuilder
discussion](https://discord.com/channels/655572317891461132/655578254970716160/1344363562608627763)),
but I'd only do that rename if there's matching consensus about a path
forward where we keep SemIRLoc, and in a way that it's only ever used
for diagnostics (the divergence from which is at the root of current
LocId discussion).

I'm trying to keep that separate from a namespace addition for clarity.
This commit is contained in:
Jon Ross-Perkins
2025-03-26 19:12:10 +00:00
committed by GitHub
parent d317c56916
commit acbe6530c3
83 changed files with 560 additions and 526 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/diagnostics/sorting_diagnostic_consumer_test.cpp
+14 -20
View File
@@ -11,7 +11,7 @@
#include "toolchain/diagnostics/diagnostic_emitter.h"
#include "toolchain/diagnostics/mocks.h"
namespace Carbon {
namespace Carbon::Diagnostics {
namespace {
using ::Carbon::Testing::IsSingleDiagnostic;
@@ -20,21 +20,21 @@ using ::testing::InSequence;
CARBON_DIAGNOSTIC(TestDiagnostic, Error, "M{0}", int);
class FakeDiagnosticEmitter : public DiagnosticEmitter<int32_t> {
class FakeEmitter : public Emitter<int32_t> {
public:
using DiagnosticEmitter::DiagnosticEmitter;
using Emitter::Emitter;
protected:
auto ConvertLoc(int32_t last_byte_offset, ContextFnT /*context_fn*/) const
-> ConvertedDiagnosticLoc override {
-> ConvertedLoc override {
return {.loc = {}, .last_byte_offset = last_byte_offset};
}
};
TEST(SortedDiagnosticEmitterTest, SortErrors) {
TEST(SortedEmitterTest, SortErrors) {
Testing::MockDiagnosticConsumer consumer;
SortingDiagnosticConsumer sorting_consumer(consumer);
FakeDiagnosticEmitter emitter(&sorting_consumer);
SortingConsumer sorting_consumer(consumer);
FakeEmitter emitter(&sorting_consumer);
emitter.Emit(1, TestDiagnostic, 1);
emitter.Emit(-1, TestDiagnostic, 2);
@@ -45,25 +45,19 @@ TEST(SortedDiagnosticEmitterTest, SortErrors) {
InSequence s;
EXPECT_CALL(consumer, HandleDiagnostic(IsSingleDiagnostic(
DiagnosticKind::TestDiagnostic,
DiagnosticLevel::Error, _, _, "M2")));
Kind::TestDiagnostic, Level::Error, _, _, "M2")));
EXPECT_CALL(consumer, HandleDiagnostic(IsSingleDiagnostic(
DiagnosticKind::TestDiagnostic,
DiagnosticLevel::Error, _, _, "M3")));
Kind::TestDiagnostic, Level::Error, _, _, "M3")));
EXPECT_CALL(consumer, HandleDiagnostic(IsSingleDiagnostic(
DiagnosticKind::TestDiagnostic,
DiagnosticLevel::Error, _, _, "M1")));
Kind::TestDiagnostic, Level::Error, _, _, "M1")));
EXPECT_CALL(consumer, HandleDiagnostic(IsSingleDiagnostic(
DiagnosticKind::TestDiagnostic,
DiagnosticLevel::Error, _, _, "M5")));
Kind::TestDiagnostic, Level::Error, _, _, "M5")));
EXPECT_CALL(consumer, HandleDiagnostic(IsSingleDiagnostic(
DiagnosticKind::TestDiagnostic,
DiagnosticLevel::Error, _, _, "M6")));
Kind::TestDiagnostic, Level::Error, _, _, "M6")));
EXPECT_CALL(consumer, HandleDiagnostic(IsSingleDiagnostic(
DiagnosticKind::TestDiagnostic,
DiagnosticLevel::Error, _, _, "M4")));
Kind::TestDiagnostic, Level::Error, _, _, "M4")));
sorting_consumer.Flush();
}
} // namespace
} // namespace Carbon
} // namespace Carbon::Diagnostics