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/format_providers_test.cpp
+46 -24
View File
@@ -9,72 +9,94 @@
#include "llvm/Support/FormatVariadic.h"
namespace Carbon {
namespace Carbon::Diagnostics {
namespace {
using ::testing::Eq;
TEST(BoolAsSelect, Cases) {
constexpr char Format[] = "{0:a|b}";
EXPECT_THAT(llvm::formatv(Format, BoolAsSelect(true)).str(), Eq("a"));
EXPECT_THAT(llvm::formatv(Format, BoolAsSelect(false)).str(), Eq("b"));
EXPECT_THAT(llvm::formatv(Format, Diagnostics::BoolAsSelect(true)).str(),
Eq("a"));
EXPECT_THAT(llvm::formatv(Format, Diagnostics::BoolAsSelect(false)).str(),
Eq("b"));
}
TEST(BoolAsSelect, CasesWithNormalFormat) {
constexpr char Format[] = "{0} {0:a|b}";
EXPECT_THAT(llvm::formatv(Format, BoolAsSelect(true)).str(), Eq("true a"));
EXPECT_THAT(llvm::formatv(Format, BoolAsSelect(false)).str(), Eq("false b"));
EXPECT_THAT(llvm::formatv(Format, Diagnostics::BoolAsSelect(true)).str(),
Eq("true a"));
EXPECT_THAT(llvm::formatv(Format, Diagnostics::BoolAsSelect(false)).str(),
Eq("false b"));
}
TEST(BoolAsSelect, Spaces) {
constexpr char Format[] = "{0: a | b }";
EXPECT_THAT(llvm::formatv(Format, BoolAsSelect(true)).str(), Eq(" a "));
EXPECT_THAT(llvm::formatv(Format, BoolAsSelect(false)).str(), Eq(" b "));
EXPECT_THAT(llvm::formatv(Format, Diagnostics::BoolAsSelect(true)).str(),
Eq(" a "));
EXPECT_THAT(llvm::formatv(Format, Diagnostics::BoolAsSelect(false)).str(),
Eq(" b "));
}
TEST(IntAsSelect, OnlyDefault) {
constexpr char Format[] = "{0::default}";
EXPECT_THAT(llvm::formatv(Format, IntAsSelect(0)).str(), Eq("default"));
EXPECT_THAT(llvm::formatv(Format, Diagnostics::IntAsSelect(0)).str(),
Eq("default"));
}
TEST(IntAsSelect, OneEquals) {
constexpr char Format[] = "{0:=0:zero}";
EXPECT_THAT(llvm::formatv(Format, IntAsSelect(0)).str(), Eq("zero"));
EXPECT_THAT(llvm::formatv(Format, Diagnostics::IntAsSelect(0)).str(),
Eq("zero"));
}
TEST(IntAsSelect, TwoEquals) {
constexpr char Format[] = "{0:=0:zero|=1:one}";
EXPECT_THAT(llvm::formatv(Format, IntAsSelect(0)).str(), Eq("zero"));
EXPECT_THAT(llvm::formatv(Format, IntAsSelect(1)).str(), Eq("one"));
EXPECT_THAT(llvm::formatv(Format, Diagnostics::IntAsSelect(0)).str(),
Eq("zero"));
EXPECT_THAT(llvm::formatv(Format, Diagnostics::IntAsSelect(1)).str(),
Eq("one"));
}
TEST(IntAsSelect, TwoEqualsAndDefault) {
constexpr char Format[] = "{0:=0:zero|=1:one|:default}";
EXPECT_THAT(llvm::formatv(Format, IntAsSelect(0)).str(), Eq("zero"));
EXPECT_THAT(llvm::formatv(Format, IntAsSelect(1)).str(), Eq("one"));
EXPECT_THAT(llvm::formatv(Format, IntAsSelect(2)).str(), Eq("default"));
EXPECT_THAT(llvm::formatv(Format, Diagnostics::IntAsSelect(0)).str(),
Eq("zero"));
EXPECT_THAT(llvm::formatv(Format, Diagnostics::IntAsSelect(1)).str(),
Eq("one"));
EXPECT_THAT(llvm::formatv(Format, Diagnostics::IntAsSelect(2)).str(),
Eq("default"));
}
TEST(IntAsSelect, Spaces) {
constexpr char Format[] = "{0:=0: zero |=1: one |: default }";
EXPECT_THAT(llvm::formatv(Format, IntAsSelect(0)).str(), Eq(" zero "));
EXPECT_THAT(llvm::formatv(Format, IntAsSelect(1)).str(), Eq(" one "));
EXPECT_THAT(llvm::formatv(Format, IntAsSelect(2)).str(), Eq(" default "));
EXPECT_THAT(llvm::formatv(Format, Diagnostics::IntAsSelect(0)).str(),
Eq(" zero "));
EXPECT_THAT(llvm::formatv(Format, Diagnostics::IntAsSelect(1)).str(),
Eq(" one "));
EXPECT_THAT(llvm::formatv(Format, Diagnostics::IntAsSelect(2)).str(),
Eq(" default "));
}
TEST(IntAsSelect, CasesWithNormalFormat) {
constexpr char Format[] = "{0} argument{0:=1:|:s}";
EXPECT_THAT(llvm::formatv(Format, IntAsSelect(0)).str(), Eq("0 arguments"));
EXPECT_THAT(llvm::formatv(Format, IntAsSelect(1)).str(), Eq("1 argument"));
EXPECT_THAT(llvm::formatv(Format, IntAsSelect(2)).str(), Eq("2 arguments"));
EXPECT_THAT(llvm::formatv(Format, Diagnostics::IntAsSelect(0)).str(),
Eq("0 arguments"));
EXPECT_THAT(llvm::formatv(Format, Diagnostics::IntAsSelect(1)).str(),
Eq("1 argument"));
EXPECT_THAT(llvm::formatv(Format, Diagnostics::IntAsSelect(2)).str(),
Eq("2 arguments"));
}
TEST(IntAsSelect, PluralS) {
constexpr char Format[] = "{0} argument{0:s}";
EXPECT_THAT(llvm::formatv(Format, IntAsSelect(0)).str(), Eq("0 arguments"));
EXPECT_THAT(llvm::formatv(Format, IntAsSelect(1)).str(), Eq("1 argument"));
EXPECT_THAT(llvm::formatv(Format, IntAsSelect(2)).str(), Eq("2 arguments"));
EXPECT_THAT(llvm::formatv(Format, Diagnostics::IntAsSelect(0)).str(),
Eq("0 arguments"));
EXPECT_THAT(llvm::formatv(Format, Diagnostics::IntAsSelect(1)).str(),
Eq("1 argument"));
EXPECT_THAT(llvm::formatv(Format, Diagnostics::IntAsSelect(2)).str(),
Eq("2 arguments"));
}
} // namespace
} // namespace Carbon
} // namespace Carbon::Diagnostics