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

Escaping chars in a less shitty way.

Browse Source
This commit is contained in:
Barry Revzin 2021-12-24 17:34:50 -06:00
parent 7134cc4462
commit ce4d81b387
1 changed files with 62 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

111
include/fmt/format.h
View File

@ -1625,71 +1625,84 @@ inline auto find_escape(const char* begin, const char* end)
#define FMT_STRING(s) FMT_STRING_IMPL(s, fmt::compile_string, ) #define FMT_STRING(s) FMT_STRING_IMPL(s, fmt::compile_string, )
template <typename Char, typename OutputIt> template <typename Char, typename OutputIt>
auto write_escaped_string(OutputIt out, basic_string_view<Char> str, auto write_escaped_string(OutputIt out, basic_string_view<Char> str) -> OutputIt {
Char = Char('"')) -> OutputIt {
return copy_str<Char>(str.data(), str.data() + str.size(), out); return copy_str<Char>(str.data(), str.data() + str.size(), out);
} }
template <typename OutputIt, typename Char>
auto write_escaped_cp(OutputIt out, find_escape_result<Char> const& escape) -> OutputIt
{
auto c = static_cast<Char>(escape.cp);
switch (escape.cp) {
case '\n':
*out++ = '\\';
c = 'n';
break;
case '\r':
*out++ = '\\';
c = 'r';
break;
case '\t':
*out++ = '\\';
c = 't';
break;
case '"':
FMT_FALLTHROUGH;
case '\'':
FMT_FALLTHROUGH;
case '\\':
*out++ = '\\';
break;
default:
if (is_utf8()) {
if (escape.cp < 0x100) {
return format_to(out, FMT_STRING("\\x{:02x}"), escape.cp);
}
if (escape.cp < 0x10000) {
return format_to(out, FMT_STRING("\\u{:04x}"), escape.cp);
}
if (escape.cp < 0x110000) {
return format_to(out, FMT_STRING("\\U{:08x}"), escape.cp);
}
}
for (char escape_char : basic_string_view<Char>(
escape.begin, to_unsigned(escape.end - escape.begin))) {
out = format_to(out, FMT_STRING("\\x{:02x}"),
static_cast<make_unsigned_char<Char>>(escape_char));
}
return out;
}
*out++ = c;
return out;
}
template <typename OutputIt> template <typename OutputIt>
auto write_escaped_string(OutputIt out, basic_string_view<char> str, auto write_escaped_string(OutputIt out, basic_string_view<char> str) -> OutputIt {
char bracket = '"') -> OutputIt { *out++ = '"';
*out++ = bracket;
auto begin = str.begin(), end = str.end(); auto begin = str.begin(), end = str.end();
do { do {
auto escape = find_escape(begin, end); auto escape = find_escape(begin, end);
out = copy_str<char>(begin, escape.begin, out); out = copy_str<char>(begin, escape.begin, out);
begin = escape.end; begin = escape.end;
if (!begin) break; if (!begin) break;
auto c = static_cast<char>(escape.cp); out = write_escaped_cp(out, escape);
switch (escape.cp) {
case '\n':
*out++ = '\\';
c = 'n';
break;
case '\r':
*out++ = '\\';
c = 'r';
break;
case '\t':
*out++ = '\\';
c = 't';
break;
case '"':
FMT_FALLTHROUGH;
case '\\':
*out++ = '\\';
break;
default:
if (is_utf8()) {
if (escape.cp < 0x100) {
out = format_to(out, FMT_STRING("\\x{:02x}"), escape.cp);
continue;
}
if (escape.cp < 0x10000) {
out = format_to(out, FMT_STRING("\\u{:04x}"), escape.cp);
continue;
}
if (escape.cp < 0x110000) {
out = format_to(out, FMT_STRING("\\U{:08x}"), escape.cp);
continue;
}
}
for (char escape_char : basic_string_view<char>(
escape.begin, to_unsigned(escape.end - escape.begin))) {
out = format_to(out, FMT_STRING("\\x{:02x}"),
static_cast<make_unsigned_char<char>>(escape_char));
}
continue;
}
*out++ = c;
} while (begin != end); } while (begin != end);
*out++ = bracket; *out++ = '"';
return out; return out;
} }
template <typename Char, typename OutputIt> template <typename Char, typename OutputIt>
auto write_escaped_char(OutputIt out, Char v) -> OutputIt { auto write_escaped_char(OutputIt out, Char v) -> OutputIt {
return write_escaped_string(out, basic_string_view<Char>(&v, 1), Char('\'')); *out++ = '\'';
if (needs_escape(v) && v != '"' || v == '\'') {
out = write_escaped_cp(out, find_escape_result<Char>{
&v, &v+1, static_cast<uint32_t>(v)
});
} else {
*out++ = v;
}
*out++ = '\'';
return out;
} }
template <typename Char, typename OutputIt> template <typename Char, typename OutputIt>