External/fmt
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add generic and native of path

Browse Source
This commit is contained in:
Jin S 2023-11-25 19:19:13 -05:00
parent 8a39388516
commit 9bbb53ffcd
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/fmt/std.h
View File

@ -78,7 +78,7 @@
#if FMT_CPP_LIB_FILESYSTEM #if FMT_CPP_LIB_FILESYSTEM
FMT_BEGIN_NAMESPACE FMT_BEGIN_NAMESPACE
namespace detail { namespace detail {
template <typename Char, typename PathChar> auto get_path_string( template <typename Char, typename PathChar> auto get_path_string(
@ -114,6 +114,7 @@ template <typename Char> struct formatter<std::filesystem::path, Char> {
format_specs<Char> specs_; format_specs<Char> specs_;
detail::arg_ref<Char> width_ref_; detail::arg_ref<Char> width_ref_;
bool debug_ = false; bool debug_ = false;
char path_type_ = 'n';
public: public:
FMT_CONSTEXPR void set_debug_format(bool set = true) { debug_ = set; } FMT_CONSTEXPR void set_debug_format(bool set = true) { debug_ = set; }
@ -130,20 +131,25 @@ template <typename Char> struct formatter<std::filesystem::path, Char> {
debug_ = true; debug_ = true;
++it; ++it;
} }
if (it != end && (*it == 'g' || *it == 'n')) {
path_type_ = *it++;
}
return it; return it;
} }
template <typename FormatContext> template <typename FormatContext>
auto format(const std::filesystem::path& p, FormatContext& ctx) const { auto format(const std::filesystem::path& p, FormatContext& ctx) const {
auto specs = specs_; auto specs = specs_;
auto path_type = path_type_;
auto path_string = (path_type == 'n') ? p.native() : p.generic_string();
detail::handle_dynamic_spec<detail::width_checker>(specs.width, width_ref_, detail::handle_dynamic_spec<detail::width_checker>(specs.width, width_ref_,
ctx); ctx);
if (!debug_) { if (!debug_) {
auto s = detail::get_path_string<Char>(p, p.native()); auto s = detail::get_path_string<Char>(p, path_string);
return detail::write(ctx.out(), basic_string_view<Char>(s), specs); return detail::write(ctx.out(), basic_string_view<Char>(s), specs);
} }
auto quoted = basic_memory_buffer<Char>(); auto quoted = basic_memory_buffer<Char>();
detail::write_escaped_path(quoted, p, p.native()); detail::write_escaped_path(quoted, p, path_string);
return detail::write(ctx.out(), return detail::write(ctx.out(),
basic_string_view<Char>(quoted.data(), quoted.size()), basic_string_view<Char>(quoted.data(), quoted.size()),
specs); specs);