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

Rename DiagnosticLocationTranslator -> DiagnosticConverter (#3804)

Browse Source 
Since the addition of TranslateArg, I don't think this type is going to
go away (cutting a TODO). Refactoring names slightly to fit the current
role, and adding const to ConvertLocation.
This commit is contained in:
Jon Ross-Perkins
2024-03-21 23:35:04 +00:00
committed by GitHub
parent 033c68c45b
commit 0bd45f0d6b
22 changed files with 204 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/source/source_buffer.cpp
+7 -6
View File
@@ -11,8 +11,9 @@
namespace Carbon {
namespace {
struct FilenameTranslator : DiagnosticLocationTranslator<llvm::StringRef> {
auto GetLocation(llvm::StringRef filename) -> DiagnosticLocation override {
struct FilenameConverter : DiagnosticConverter<llvm::StringRef> {
auto ConvertLocation(llvm::StringRef filename) const
-> DiagnosticLocation override {
return {.filename = filename};
}
};
@@ -28,8 +29,8 @@ auto SourceBuffer::MakeFromFile(llvm::vfs::FileSystem& fs,
llvm::StringRef filename,
DiagnosticConsumer& consumer)
-> std::optional<SourceBuffer> {
FilenameTranslator translator;
DiagnosticEmitter<llvm::StringRef> emitter(translator, consumer);
FilenameConverter converter;
DiagnosticEmitter<llvm::StringRef> emitter(converter, consumer);
llvm::ErrorOr<std::unique_ptr<llvm::vfs::File>> file =
fs.openFileForRead(filename);
@@ -63,8 +64,8 @@ auto SourceBuffer::MakeFromMemoryBuffer(
llvm::ErrorOr<std::unique_ptr<llvm::MemoryBuffer>> buffer,
llvm::StringRef filename, bool is_regular_file,
DiagnosticConsumer& consumer) -> std::optional<SourceBuffer> {
FilenameTranslator translator;
DiagnosticEmitter<llvm::StringRef> emitter(translator, consumer);
FilenameConverter converter;
DiagnosticEmitter<llvm::StringRef> emitter(converter, consumer);
if (buffer.getError()) {
CARBON_DIAGNOSTIC(ErrorReadingFile, Error, "Error reading file: {0}",