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

Switch formatv adapters to format_provider (#3434)

Browse Source 
The main difference I'm aiming for is that clangd doesn't complain about
the struct being unused, but it does miss the function's use. But really
these are specific to formatv for diagnostics, so this is more clearly
marking such, and probably makes for a better pattern for the future.
This commit is contained in:
Jon Ross-Perkins
2023-11-30 18:33:03 +00:00
committed by GitHub
parent 0db63ff17a
commit 05723095bc
2 changed files with 50 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/lex/numeric_literal.cpp
+25 -19
View File
@@ -8,30 +8,36 @@
#include "common/check.h"
#include "llvm/ADT/StringExtras.h"
#include "llvm/Support/FormatVariadicDetails.h"
#include "toolchain/lex/character_set.h"
#include "toolchain/lex/helpers.h"
namespace Carbon::Lex {
namespace llvm {
// Adapts Radix for use with formatv.
// NOTE: clangd may see this as unused, but it will be invoked by diagnostics.
// We don't do anything to disable the warning because clang compile invocations
// should warn if it's actually unused.
static auto operator<<(llvm::raw_ostream& out, NumericLiteral::Radix radix)
-> llvm::raw_ostream& {
switch (radix) {
case NumericLiteral::Radix::Binary:
out << "binary";
break;
case NumericLiteral::Radix::Decimal:
out << "decimal";
break;
case NumericLiteral::Radix::Hexadecimal:
out << "hexadecimal";
break;
// We use formatv primarily for diagnostics. In these cases, it's expected that
// the spelling in source code should be used.
template <>
struct format_provider<Carbon::Lex::NumericLiteral::Radix> {
using Radix = Carbon::Lex::NumericLiteral::Radix;
static void format(const Radix& radix, raw_ostream& out,
StringRef /*style*/) {
switch (radix) {
case Radix::Binary:
out << "binary";
break;
case Radix::Decimal:
out << "decimal";
break;
case Radix::Hexadecimal:
out << "hexadecimal";
break;
}
}
return out;
}
};
} // namespace llvm
namespace Carbon::Lex {
auto NumericLiteral::Lex(llvm::StringRef source_text)
-> std::optional<NumericLiteral> {
toolchain/parse/context.cpp
+25 -15
View File
@@ -23,23 +23,33 @@ enum class RelativeLocation : int8_t {
Before,
};
} // namespace Carbon::Parse
namespace llvm {
// Adapts RelativeLocation for use with formatv.
// TODO: Investigate for approaches that clangd is happier with.
static auto operator<<(llvm::raw_ostream& out, RelativeLocation loc)
-> llvm::raw_ostream& {
switch (loc) {
case RelativeLocation::Around:
out << "around";
break;
case RelativeLocation::After:
out << "after";
break;
case RelativeLocation::Before:
out << "before";
break;
template <>
struct format_provider<Carbon::Parse::RelativeLocation> {
using RelativeLocation = Carbon::Parse::RelativeLocation;
static void format(const RelativeLocation& loc, raw_ostream& out,
StringRef /*style*/) {
switch (loc) {
case RelativeLocation::Around:
out << "around";
break;
case RelativeLocation::After:
out << "after";
break;
case RelativeLocation::Before:
out << "before";
break;
}
}
return out;
}
};
} // namespace llvm
namespace Carbon::Parse {
Context::Context(Tree& tree, Lex::TokenizedBuffer& tokens,
Lex::TokenDiagnosticEmitter& emitter,