fmtlib/fmt
1
0
Fork 1
mirror of https://github.com/fmtlib/fmt.git synced 2025-10-28 20:51:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improve handling of custom arguments

Browse Source
This commit is contained in:
Victor Zverovich
2017-12-02 09:44:48 -08:00
parent e0243000de
commit 10e70a06c9
5 changed files with 46 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
test/custom-formatter-test.cc
View File

@@ -29,22 +29,6 @@ class CustomArgFormatter : public fmt::arg_formatter<char> {
}
};
// A custom argument formatter that doesn't print `-` for floating-point values
// rounded to 0.
class CustomPrintfArgFormatter : public printf_arg_formatter<char> {
public:
CustomPrintfArgFormatter(fmt::buffer &buf, fmt::format_specs &spec)
: printf_arg_formatter<char>(buf, spec) {}
using printf_arg_formatter<char>::operator();
void operator()(double value) {
if (round(value * pow(10, spec().precision())) == 0)
value = 0;
printf_arg_formatter<char>::operator()(value);
}
};
std::string custom_vformat(fmt::string_view format_str, fmt::args args) {
fmt::memory_buffer buffer;
// Pass custom argument formatter as a template arg to vwrite.
@@ -58,25 +42,6 @@ std::string custom_format(const char *format_str, const Args & ... args) {
return custom_vformat(format_str, va);
}
typedef fmt::printf_context<char, CustomPrintfArgFormatter>
CustomPrintfFormatter;
std::string custom_vsprintf(
const char* format_str,
fmt::basic_args<CustomPrintfFormatter> args) {
fmt::memory_buffer buffer;
CustomPrintfFormatter formatter(format_str, args);
formatter.format(buffer);
return std::string(buffer.data(), buffer.size());
}
template <typename... Args>
std::string custom_sprintf(const char *format_str, const Args & ... args) {
auto va = fmt::make_args<CustomPrintfFormatter>(args...);
return custom_vsprintf(format_str, va);
}
TEST(CustomFormatterTest, Format) {
EXPECT_EQ("0.00", custom_format("{:.2f}", -.00001));
EXPECT_EQ("0.00", custom_sprintf("%.2f", -.00001));
}