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

include/fmt/core.h: error handling and return separated

Browse Source
This commit is contained in:
Maksymilian Czudziak 2022-11-28 07:24:08 +01:00
parent 645f140426
commit 5e4a210135
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
include/fmt/core.h
View File

@ -2695,8 +2695,10 @@ FMT_CONSTEXPR FMT_INLINE void parse_format_string(
handler.on_text(begin, p - 1); handler.on_text(begin, p - 1);
begin = p = parse_replacement_field(p - 1, end, handler); begin = p = parse_replacement_field(p - 1, end, handler);
} else if (c == '}') { } else if (c == '}') {
if (p == end || *p != '}') if (p == end || *p != '}') {
return handler.on_error("unmatched '}' in format string"); handler.on_error("unmatched '}' in format string");
return;
}
handler.on_text(begin, p); handler.on_text(begin, p);
begin = ++p; begin = ++p;
} }
@ -2709,11 +2711,15 @@ FMT_CONSTEXPR FMT_INLINE void parse_format_string(
if (from == to) return; if (from == to) return;
for (;;) { for (;;) {
const Char* p = nullptr; const Char* p = nullptr;
if (!find<IS_CONSTEXPR>(from, to, Char('}'), p)) if (!find<IS_CONSTEXPR>(from, to, Char('}'), p)) {
return handler_.on_text(from, to); handler_.on_text(from, to);
return;
}
++p; ++p;
if (p == to || *p != '}') if (p == to || *p != '}') {
return handler_.on_error("unmatched '}' in format string"); handler_.on_error("unmatched '}' in format string");
return;
}
handler_.on_text(from, p); handler_.on_text(from, p);
from = p + 1; from = p + 1;
} }
@ -2724,8 +2730,10 @@ FMT_CONSTEXPR FMT_INLINE void parse_format_string(
// Doing two passes with memchr (one for '{' and another for '}') is up to // Doing two passes with memchr (one for '{' and another for '}') is up to
// 2.5x faster than the naive one-pass implementation on big format strings. // 2.5x faster than the naive one-pass implementation on big format strings.
const Char* p = begin; const Char* p = begin;
if (*begin != '{' && !find<IS_CONSTEXPR>(begin + 1, end, Char('{'), p)) if (*begin != '{' && !find<IS_CONSTEXPR>(begin + 1, end, Char('{'), p)) {
return write(begin, end); write(begin, end);
return;
}
write(begin, p); write(begin, p);
begin = parse_replacement_field(p, end, handler); begin = parse_replacement_field(p, end, handler);
} }