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

Use DiagnosticEmitter for phase-specific types (#5188)

Browse Source 
Given the namespacing of `Diagnostics` in #5173, now we can use
`DiagnosticEmitter` for phase-specific emitters. This is consistent with
how we do `Context`, and also check had started this with
`DiagnosticBuilder` in anticipation of the namespacing.

Also renames `Emitter::DiagnosticBuilder` to `Emitter::Builder` for
consistency with other `Diagnostics` entities.

In check, I'm still splitting `DiagnosticEmitterBase` and
`DiagnosticEmitter` just to keep the emitter definition separate from
the context.

Also cleans up some incorrect check diagnostic emitter dependencies in
lower.
This commit is contained in:
Jon Ross-Perkins
2025-03-27 00:41:30 +00:00
committed by GitHub
parent 9d3e1d3c55
commit 0a3efb76ed
17 changed files with 87 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/lex/string_literal.cpp
+6 -6
View File
@@ -14,7 +14,7 @@
namespace Carbon::Lex {
using LexerDiagnosticEmitter = Diagnostics::Emitter<const char*>;
using DiagnosticEmitter = Diagnostics::Emitter<const char*>;
static constexpr char MultiLineIndicator[] = R"(''')";
static constexpr char DoubleQuotedMultiLineIndicator[] = R"(""")";
@@ -202,7 +202,7 @@ static auto ComputeIndentOfFinalLine(llvm::StringRef text) -> llvm::StringRef {
// Check the literal is indented properly, if it's a multi-line litera.
// Find the leading whitespace that should be removed from each line of a
// multi-line string literal.
static auto CheckIndent(LexerDiagnosticEmitter& emitter, llvm::StringRef text,
static auto CheckIndent(DiagnosticEmitter& emitter, llvm::StringRef text,
llvm::StringRef content) -> llvm::StringRef {
// Find the leading horizontal whitespace on the final line of this literal.
// Note that for an empty literal, this might not be inside the content.
@@ -222,7 +222,7 @@ static auto CheckIndent(LexerDiagnosticEmitter& emitter, llvm::StringRef text,
}
// Expand a `\u{HHHHHH}` escape sequence into a sequence of UTF-8 code units.
static auto ExpandUnicodeEscapeSequence(LexerDiagnosticEmitter& emitter,
static auto ExpandUnicodeEscapeSequence(DiagnosticEmitter& emitter,
llvm::StringRef digits,
char*& buffer_cursor) -> bool {
unsigned code_point;
@@ -279,7 +279,7 @@ static auto AppendFrontOfContents(char*& buffer_cursor,
// `result` string. `content` is the string content, starting from the first
// character after the escape sequence introducer (for example, the `n` in
// `\n`), and will be updated to remove the leading escape sequence.
static auto ExpandAndConsumeEscapeSequence(LexerDiagnosticEmitter& emitter,
static auto ExpandAndConsumeEscapeSequence(DiagnosticEmitter& emitter,
llvm::StringRef& content,
char*& buffer_cursor) -> void {
CARBON_CHECK(!content.empty(), "should have escaped closing delimiter");
@@ -364,7 +364,7 @@ static auto ExpandAndConsumeEscapeSequence(LexerDiagnosticEmitter& emitter,
// Expand any escape sequences in the given string literal.
static auto ExpandEscapeSequencesAndRemoveIndent(
LexerDiagnosticEmitter& emitter, llvm::StringRef contents, int hash_level,
DiagnosticEmitter& emitter, llvm::StringRef contents, int hash_level,
llvm::StringRef indent, char* buffer) -> llvm::StringRef {
char* buffer_cursor = buffer;
@@ -464,7 +464,7 @@ static auto ExpandEscapeSequencesAndRemoveIndent(
}
auto StringLiteral::ComputeValue(llvm::BumpPtrAllocator& allocator,
LexerDiagnosticEmitter& emitter) const
DiagnosticEmitter& emitter) const
-> llvm::StringRef {
if (!is_terminated_) {
return "";