leavelet/fmt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace ArgVisitor::visit with a free visit function

Browse Source
This commit is contained in:
Victor Zverovich
2016-11-19 07:59:54 -08:00
parent caa60b9c99
commit c9dc41ab3f
5 changed files with 28 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fmt/format.h
+8 -13
View File
@@ -1535,6 +1535,13 @@ typedef basic_format_args<basic_format_context<wchar_t>> wformat_args;
#define FMT_DISPATCH(call) static_cast<Impl*>(this)->call
/**
\rst
Visits an argument dispatching to the appropriate visit method based on
the argument type. For example, if the argument type is ``double`` then
``vis(value)`` will be called with the value of type ``double``.
\endrst
*/
template <typename Visitor>
typename std::result_of<Visitor(int)>::type visit(Visitor &&vis,
format_arg arg) {
@@ -1738,18 +1745,6 @@ class ArgVisitor {
Result operator()(format_arg::CustomValue value) {
return FMT_DISPATCH(visit_custom(value));
}
/**
\rst
Visits an argument dispatching to the appropriate visit method based on
the argument type. For example, if the argument type is ``double`` then
the `~fmt::ArgVisitor::operator()(double)` method of the *Impl* class will
be called.
\endrst
*/
Result visit(const format_arg &arg) {
return fmt::visit(*static_cast<Impl*>(this), arg);
}
};
enum Alignment {
@@ -3683,7 +3678,7 @@ void do_format_arg(BasicWriter<Char> &writer, const internal::Arg &arg,
FMT_THROW(format_error("missing '}' in format string"));
// Format argument.
ArgFormatter(writer, ctx, spec).visit(arg);
visit(ArgFormatter(writer, ctx, spec), arg);
}
/** Formats arguments and writes the output to the writer. */
fmt/printf.h
+13 -13
View File
@@ -388,7 +388,7 @@ unsigned printf_context<Char, AF>::parse_header(
spec.width_ = internal::parse_nonnegative_int(s);
} else if (*s == '*') {
++s;
spec.width_ = internal::WidthHandler(spec).visit(get_arg(s));
spec.width_ = visit(internal::WidthHandler(spec), get_arg(s));
}
return arg_index;
}
@@ -420,13 +420,13 @@ void printf_context<Char, AF>::format(BasicWriter<Char> &writer) {
spec.precision_ = static_cast<int>(internal::parse_nonnegative_int(s));
} else if (*s == '*') {
++s;
spec.precision_ = internal::PrecisionHandler().visit(get_arg(s));
spec.precision_ = visit(internal::PrecisionHandler(), get_arg(s));
}
}
using internal::Arg;
Arg arg = get_arg(s, arg_index);
if (spec.flag(HASH_FLAG) && internal::IsZeroInt().visit(arg))
if (spec.flag(HASH_FLAG) && visit(internal::IsZeroInt(), arg))
spec.flags_ &= ~internal::to_unsigned<int>(HASH_FLAG);
if (spec.fill_ == '0') {
if (arg.type <= Arg::LAST_NUMERIC_TYPE)
@@ -440,24 +440,24 @@ void printf_context<Char, AF>::format(BasicWriter<Char> &writer) {
switch (*s++) {
case 'h':
if (*s == 'h')
ArgConverter<signed char>(arg, *++s).visit(arg);
visit(ArgConverter<signed char>(arg, *++s), arg);
else
ArgConverter<short>(arg, *s).visit(arg);
visit(ArgConverter<short>(arg, *s), arg);
break;
case 'l':
if (*s == 'l')
ArgConverter<fmt::LongLong>(arg, *++s).visit(arg);
visit(ArgConverter<fmt::LongLong>(arg, *++s), arg);
else
ArgConverter<long>(arg, *s).visit(arg);
visit(ArgConverter<long>(arg, *s), arg);
break;
case 'j':
ArgConverter<intmax_t>(arg, *s).visit(arg);
visit(ArgConverter<intmax_t>(arg, *s), arg);
break;
case 'z':
ArgConverter<std::size_t>(arg, *s).visit(arg);
visit(ArgConverter<std::size_t>(arg, *s), arg);
break;
case 't':
ArgConverter<std::ptrdiff_t>(arg, *s).visit(arg);
visit(ArgConverter<std::ptrdiff_t>(arg, *s), arg);
break;
case 'L':
// printf produces garbage when 'L' is omitted for long double, no
@@ -465,7 +465,7 @@ void printf_context<Char, AF>::format(BasicWriter<Char> &writer) {
break;
default:
--s;
ArgConverter<void>(arg, *s).visit(arg);
visit(ArgConverter<void>(arg, *s), arg);
}
// Parse type.
@@ -480,7 +480,7 @@ void printf_context<Char, AF>::format(BasicWriter<Char> &writer) {
break;
case 'c':
// TODO: handle wchar_t
internal::CharConverter(arg).visit(arg);
visit(internal::CharConverter(arg), arg);
break;
}
}
@@ -488,7 +488,7 @@ void printf_context<Char, AF>::format(BasicWriter<Char> &writer) {
start = s;
// Format argument.
AF(writer, spec).visit(arg);
visit(AF(writer, spec), arg);
}
internal::write(writer, start, s);
}