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

Remove all subnamespaces with names matching "__*" mask

Browse Source 
Signed-off-by: Vladislav Shchapov <vladislav@shchapov.ru>
This commit is contained in:
Vladislav Shchapov 2022-09-28 13:33:24 +05:00
parent 6e33d881e2
commit db2fde1836
1 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
include/fmt/std.h
View File

@ -214,32 +214,38 @@ struct formatter<
std::size_t size = 0; std::size_t size = 0;
std::unique_ptr<char, decltype(&std::free)> demangled_name_ptr( std::unique_ptr<char, decltype(&std::free)> demangled_name_ptr(
abi::__cxa_demangle(ti.name(), nullptr, &size, &status), &std::free); abi::__cxa_demangle(ti.name(), nullptr, &size, &status), &std::free);
string_view demangled_name_view(
demangled_name_ptr ? demangled_name_ptr.get() : ti.name());
// Normalization of stdlib inline namespace names. string_view demangled_name_view;
if (demangled_name_view.starts_with("std::")) { if (demangled_name_ptr) {
// Separation of user's and system exception classes. demangled_name_view = demangled_name_ptr.get();
demangled_name_view.remove_prefix(5);
out = detail::write_bytes(out, string_view("std::"), spec);
// Normalization of stdlib inline namespace names.
// libc++ inline namespaces. // libc++ inline namespaces.
// std::__1::* -> std::* // std::__1::* -> std::*
// std::__1::__fs::* -> std::* // std::__1::__fs::* -> std::*
if (demangled_name_view.starts_with("__1::")) {
demangled_name_view.remove_prefix(5);
if (demangled_name_view.starts_with("__fs::"))
demangled_name_view.remove_prefix(6);
}
// libstdc++ inline namespaces. // libstdc++ inline namespaces.
// std::__cxx11::* -> std::* // std::__cxx11::* -> std::*
// std::filesystem::__cxx11::* -> std::filesystem::* // std::filesystem::__cxx11::* -> std::filesystem::*
else if (demangled_name_view.starts_with("__cxx11::")) { if (demangled_name_view.starts_with("std::")) {
demangled_name_view.remove_prefix(9); char* begin = demangled_name_ptr.get();
} else if (demangled_name_view.starts_with("filesystem::__cxx11::")) { char* to = begin + 5; // std::
demangled_name_view.remove_prefix(21); for (char *from = to, *end = begin + demangled_name_view.size();
out = detail::write_bytes(out, string_view("filesystem::"), spec); from < end;) {
// This is safe, because demangled_name is NUL-terminated.
if (from[0] == '_' && from[1] == '_') {
char* next = from + 1;
while (next < end && *next != ':') next++;
if (next[0] == ':' && next[1] == ':') {
from = next + 2;
continue;
}
}
*to++ = *from++;
}
demangled_name_view = {begin, detail::to_unsigned(to - begin)};
} }
} else {
demangled_name_view = string_view(ti.name());
} }
out = detail::write_bytes(out, demangled_name_view, spec); out = detail::write_bytes(out, demangled_name_view, spec);
#elif FMT_MSC_VERSION #elif FMT_MSC_VERSION