feedc0de/fmt
1
0
Fork 0
forked from fmtlib/fmt
Code Pull Requests Activity

Implement debug format for error_code

Browse Source
This commit is contained in:
Victor Zverovich
2025-04-27 09:06:17 -07:00
parent a7d7b894cd
commit c936e2e44e
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
include/fmt/std.h
View File

@ -410,6 +410,7 @@ template <> struct formatter<std::error_code> {
private: private:
format_specs specs_; format_specs specs_;
detail::arg_ref<char> width_ref_; detail::arg_ref<char> width_ref_;
bool debug_ = false;
public: public:
FMT_CONSTEXPR auto parse(parse_context<>& ctx) -> const char* { FMT_CONSTEXPR auto parse(parse_context<>& ctx) -> const char* {
@ -417,14 +418,16 @@ template <> struct formatter<std::error_code> {
if (it == end) return it; if (it == end) return it;
it = detail::parse_align(it, end, specs_); it = detail::parse_align(it, end, specs_);
if (it == end) return it;
char c = *it; char c = *it;
if ((c >= '0' && c <= '9') || c == '{') if (it != end && ((c >= '0' && c <= '9') || c == '{'))
it = detail::parse_width(it, end, specs_, width_ref_, ctx); it = detail::parse_width(it, end, specs_, width_ref_, ctx);
if (it == end) return it;
if (*it == 's') { if (it != end && *it == '?') {
debug_ = true;
++it;
}
if (it != end && *it == 's') {
specs_.set_type(presentation_type::string); specs_.set_type(presentation_type::string);
++it; ++it;
} }
@ -445,8 +448,13 @@ template <> struct formatter<std::error_code> {
buf.push_back(':'); buf.push_back(':');
detail::write<char>(appender(buf), ec.value()); detail::write<char>(appender(buf), ec.value());
} }
return detail::write<char>(ctx.out(), string_view(buf.data(), buf.size()), auto quoted = memory_buffer();
specs); auto str = string_view(buf.data(), buf.size());
if (debug_) {
detail::write_escaped_string<char>(std::back_inserter(quoted), str);
str = string_view(quoted.data(), quoted.size());
}
return detail::write<char>(ctx.out(), str, specs);
} }
}; };

2
test/std-test.cc
View File

@ -286,6 +286,8 @@ TEST(std_test, error_code) {
"system:-42"); "system:-42");
auto ec = std::make_error_code(std::errc::value_too_large); auto ec = std::make_error_code(std::errc::value_too_large);
EXPECT_EQ(fmt::format("{:s}", ec), ec.message()); EXPECT_EQ(fmt::format("{:s}", ec), ec.message());
EXPECT_EQ(fmt::format("{:?}", std::error_code(42, generic)),
"\"generic:42\"");
} }
template <typename Catch> void exception_test() { template <typename Catch> void exception_test() {