fmtlib/fmt
1
0
Fork 1
mirror of https://github.com/fmtlib/fmt.git synced 2025-11-02 23:21:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improve handling of format strings in custom arguments.

Browse Source
This commit is contained in:
Victor Zverovich
2014-08-29 07:23:54 -07:00
parent 3947a7a98c
commit 271fa8c908
3 changed files with 17 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
format.cc
View File

@@ -175,19 +175,6 @@ int parse_nonnegative_int(const Char *&s) {
return value;
}
template <typename Char>
const Char *find_closing_brace(const Char *s, int num_open_braces = 1) {
for (int n = num_open_braces; *s; ++s) {
if (*s == '{') {
++n;
} else if (*s == '}') {
if (--n == 0)
return s;
}
}
throw fmt::FormatError("unmatched '{' in format");
}
template <typename Char>
void check_sign(const Char *&s, const Arg &arg) {
char sign = static_cast<char>(*s);
@@ -574,7 +561,7 @@ class fmt::internal::ArgFormatter :
}
void visit_custom(Arg::CustomValue c) {
c.format(&formatter_, c.value, format_);
c.format(&formatter_, c.value, &format_);
}
};
@@ -1019,11 +1006,13 @@ void fmt::internal::PrintfFormatter<Char>::format(
spec.type_ = 'x';
writer.write_int(reinterpret_cast<uintptr_t>(arg.pointer_value), spec);
break;
case Arg::CUSTOM:
case Arg::CUSTOM: {
if (spec.type_)
internal::report_unknown_type(spec.type_, "object");
arg.custom.format(&writer, arg.custom.value, "s");
const void *s = "s";
arg.custom.format(&writer, arg.custom.value, &s);
break;
}
default:
assert(false);
break;
@@ -1034,14 +1023,14 @@ void fmt::internal::PrintfFormatter<Char>::format(
template <typename Char>
const Char *fmt::BasicFormatter<Char>::format(
const Char *format_str, const Arg &arg) {
const Char *&format_str, const Arg &arg) {
const Char *s = format_str;
const char *error = 0;
FormatSpec spec;
if (*s == ':') {
if (arg.type == Arg::CUSTOM) {
arg.custom.format(this, arg.custom.value, s);
return find_closing_brace(s) + 1;
arg.custom.format(this, arg.custom.value, &s);
return s;
}
++s;
// Parse fill and alignment.